Restore list replace type assumption

Author: adazem009

src/engine/internal/llvm/instructions/lists.cpp

@@ -239,15 +239,17 @@ LLVMInstruction *Lists::buildListReplace(LLVMInstruction *ins)
     m_builder.SetInsertPoint(replaceBlock);
 
     llvm::Value *itemPtr = m_utils.getListItem(listPtr, indexInt);
-    // llvm::Value *typeVar = createListTypeVar(listPtr, itemPtr);
-    //   createListTypeAssumption(listPtr, typeVar, ins->targetType);
-
-    /*llvm::Value *typeVar = m_utils.addAlloca(m_builder.getInt32Ty());
-    llvm::Value *t = m_builder.CreateLoad(m_builder.getInt32Ty(), m_utils.getValueTypePtr(itemPtr));
-    m_builder.CreateStore(t, typeVar);*/
-    llvm::Value *typeVar = m_utils.getValueTypePtr(itemPtr);
+    llvm::Value *typePtr = m_utils.getValueTypePtr(itemPtr);
+    llvm::Value *loadedType = m_builder.CreateLoad(m_builder.getInt32Ty(), typePtr);
+    llvm::Value *typeVar = createListTypeVar(listPtr, loadedType);
 
+    createListTypeAssumption(listPtr, typeVar, ins->targetType);
     m_utils.createValueStore(itemPtr, typeVar, valueArg.second, listType, type);
+
+    // Value store may change type, make sure to update it
+    loadedType = m_builder.CreateLoad(m_builder.getInt32Ty(), typeVar);
+    m_builder.CreateStore(loadedType, typePtr);
+
     createListTypeUpdate(listPtr, valueArg.second, type);
     m_builder.CreateBr(nextBlock);
 
@@ -470,6 +472,9 @@ void Lists::createListTypeAssumption(const LLVMListPtr &listPtr, llvm::Value *ty
 
         llvm::Value *type = m_builder.CreateLoad(m_builder.getInt32Ty(), typeVar);
 
+        if (!inRange)
+            inRange = m_builder.getInt1(true);
+
         llvm::Value *numberType = m_builder.getInt32(static_cast<uint32_t>(ValueType::Number));
         llvm::Value *boolType = m_builder.getInt32(static_cast<uint32_t>(ValueType::Bool));
         llvm::Value *stringType = m_builder.getInt32(static_cast<uint32_t>(ValueType::String));

src/engine/internal/llvm/instructions/lists.h

@@ -39,7 +39,7 @@ class Lists : public InstructionGroup
 
         void createListTypeUpdate(const LLVMListPtr &listPtr, const LLVMRegister *newValue, Compiler::StaticType newValueType);
         llvm::Value *createListTypeVar(const LLVMListPtr &listPtr, llvm::Value *type);
-        void createListTypeAssumption(const LLVMListPtr &listPtr, llvm::Value *typeVar, Compiler::StaticType staticType, llvm::Value *inRange);
+        void createListTypeAssumption(const LLVMListPtr &listPtr, llvm::Value *typeVar, Compiler::StaticType staticType, llvm::Value *inRange = nullptr);
 };
 
 } // namespace llvmins