LLVMCodeBuilder: Fix string deallocation after stop instruction

adazem009 · adazem009 · commit 3f276ef4b9c7 · 2025-02-23T13:29:40.000+01:00
diff --git a/src/engine/internal/llvm/llvmcodebuilder.cpp b/src/engine/internal/llvm/llvmcodebuilder.cpp
@@ -1246,6 +1246,7 @@ std::shared_ptr<ExecutableCode> LLVMCodeBuilder::finalize()
             }
 
             case LLVMInstruction::Type::Stop: {
+                freeScopeHeap();
                 m_builder.CreateBr(endBranch);
                 llvm::BasicBlock *nextBranch = llvm::BasicBlock::Create(m_llvmCtx, "", m_function);
                 m_builder.SetInsertPoint(nextBranch);
@@ -1309,11 +1310,11 @@ std::shared_ptr<ExecutableCode> LLVMCodeBuilder::finalize()
         }
     }
 
+    assert(m_stringHeap.size() == 1);
+    freeScopeHeap();
     m_builder.CreateBr(endBranch);
 
     m_builder.SetInsertPoint(endBranch);
-    assert(m_stringHeap.size() == 1);
-    freeScopeHeap();
     syncVariables(targetVariables);
 
     // End and verify the function

Original file line number	Diff line number	Diff line change
`@@ -1246,6 +1246,7 @@ std::shared_ptr<ExecutableCode> LLVMCodeBuilder::finalize()`
`1246`	`1246`	`}`
`1247`	`1247`
`1248`	`1248`	`case LLVMInstruction::Type::Stop: {`
	`1249`	`+ freeScopeHeap();`
`1249`	`1250`	`m_builder.CreateBr(endBranch);`
`1250`	`1251`	`llvm::BasicBlock *nextBranch = llvm::BasicBlock::Create(m_llvmCtx, "", m_function);`
`1251`	`1252`	`m_builder.SetInsertPoint(nextBranch);`
`@@ -1309,11 +1310,11 @@ std::shared_ptr<ExecutableCode> LLVMCodeBuilder::finalize()`
`1309`	`1310`	`}`
`1310`	`1311`	`}`
`1311`	`1312`
	`1313`	`+ assert(m_stringHeap.size() == 1);`
	`1314`	`+ freeScopeHeap();`
`1312`	`1315`	`m_builder.CreateBr(endBranch);`
`1313`	`1316`
`1314`	`1317`	`m_builder.SetInsertPoint(endBranch);`
`1315`		`- assert(m_stringHeap.size() == 1);`
`1316`		`- freeScopeHeap();`
`1317`	`1318`	`syncVariables(targetVariables);`
`1318`	`1319`
`1319`	`1320`	`// End and verify the function`