From fe4027d33aba2192855e9a0ee461133dae995de6 Mon Sep 17 00:00:00 2001
From: Brian Fiete <bfiete@gmail.com>
Date: Thu, 13 Aug 2020 14:44:14 -0700
Subject: [PATCH] Fixed string serialization issue in attributes

---
 IDEHelper/Backend/BeIRCodeGen.cpp | 2 +-
 IDEHelper/Compiler/BfModule.cpp   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/IDEHelper/Backend/BeIRCodeGen.cpp b/IDEHelper/Backend/BeIRCodeGen.cpp
index 940a7dd9..9b5a702f 100644
--- a/IDEHelper/Backend/BeIRCodeGen.cpp
+++ b/IDEHelper/Backend/BeIRCodeGen.cpp
@@ -1755,7 +1755,7 @@ void BeIRCodeGen::HandleNextCmd()
 			CMD_PARAM(BeType*, varType);
 			CMD_PARAM(bool, isConstant);
 			BfIRLinkageType linkageType = (BfIRLinkageType)mStream->Read();			
-			CMD_PARAM(String, name);
+			CMD_PARAM(StringT<256>, name);
 			CMD_PARAM(bool, isTLS);
 			CMD_PARAM(BeConstant*, initializer);
 						
diff --git a/IDEHelper/Compiler/BfModule.cpp b/IDEHelper/Compiler/BfModule.cpp
index 0b223e4d..37729d82 100644
--- a/IDEHelper/Compiler/BfModule.cpp
+++ b/IDEHelper/Compiler/BfModule.cpp
@@ -5644,6 +5644,7 @@ BfIRValue BfModule::CreateTypeData(BfType* type, Dictionary<int, int>& usedStrin
 						GetStringObjectValue(stringId);
 						PUSH_INT8(0xFF); // String
 						PUSH_INT32(*orderedIdPtr);
+						argIdx++;
 						continue;
 					}
 
@@ -5663,6 +5664,7 @@ BfIRValue BfModule::CreateTypeData(BfType* type, Dictionary<int, int>& usedStrin
 								GetStringObjectValue(stringId);
 								PUSH_INT8(0xFF); // String
 								PUSH_INT32(*orderedIdPtr);
+								argIdx++;
 								continue;
 							}
 						}