@@ -79,14 +79,25 @@ void LLVMBuildUtils::init(llvm::Function *function, BlockPrototype *procedurePro
7979 reg->intValue = llvm::ConstantInt::get (m_builder.getInt64Ty (), reg->constValue ().toDouble (), true );
8080 }
8181
82+ // Create string count variable (LLVM should optimize it into a constant later)
83+ m_stringCountVar = m_builder.CreateAlloca (m_builder.getInt64Ty (), nullptr , " stringCount" );
84+
85+ // Create string array variable
86+ m_stringArrayVar = m_builder.CreateAlloca (m_stringPtrType->getPointerTo (), nullptr , " stringArray" );
87+
88+ // Create string count block (string count is known after all instructions are processed)
89+ m_stringCountBlock = llvm::BasicBlock::Create (m_llvmCtx, " getStringCount" , m_function);
90+ m_builder.CreateBr (m_stringCountBlock);
91+ // NOTE: This block is terminated later
92+
8293 // Create string allocation block
94+ m_builder.SetInsertPoint (m_stringCountBlock);
8395 m_stringAllocaBlock = llvm::BasicBlock::Create (m_llvmCtx, " stringAlloca" , m_function);
84- m_builder. CreateBr (m_stringAllocaBlock);
96+ // NOTE: This block is terminated later
8597
86- // Get string array
98+ // Push string stack (load string array)
8799 m_builder.SetInsertPoint (m_stringAllocaBlock);
88- m_stringArray = m_builder.CreateCall (m_functions.resolve_llvm_get_string_array (), { m_executionContextPtr, m_functionIdValue });
89- // NOTE: This block is terminated later
100+ pushStringStack ();
90101
91102 // Create next block
92103 m_stringAllocaNextBlock = llvm::BasicBlock::Create (m_llvmCtx, " entry.next" , m_function);
@@ -146,11 +157,13 @@ void LLVMBuildUtils::init(llvm::Function *function, BlockPrototype *procedurePro
146157
147158void LLVMBuildUtils::end (LLVMInstruction *lastInstruction, LLVMRegister *lastConstant)
148159{
149- // Terminate string allocation block
150- if (m_stringCount == 0 )
151- m_stringAllocaBlock->erase (m_stringAllocaBlock->begin (), m_stringAllocaBlock->end ());
152-
160+ // Terminate string count and allocation blocks
153161 llvm::BasicBlock *previousBlock = m_builder.GetInsertBlock ();
162+ m_builder.SetInsertPoint (m_stringCountBlock);
163+ m_builder.CreateStore (m_builder.getInt64 (m_stringCount), m_stringCountVar);
164+
165+ m_builder.CreateBr (m_stringAllocaBlock);
166+
154167 m_builder.SetInsertPoint (m_stringAllocaBlock);
155168 m_builder.CreateBr (m_stringAllocaNextBlock);
156169 m_builder.SetInsertPoint (previousBlock);
@@ -165,6 +178,7 @@ void LLVMBuildUtils::end(LLVMInstruction *lastInstruction, LLVMRegister *lastCon
165178
166179 // End branch
167180 m_builder.SetInsertPoint (m_endBranch);
181+ popStringStack ();
168182
169183 llvm::PointerType *pointerType = llvm::PointerType::get (llvm::Type::getInt8Ty (m_llvmCtx), 0 );
170184
@@ -198,6 +212,7 @@ void LLVMBuildUtils::end(LLVMInstruction *lastInstruction, LLVMRegister *lastCon
198212
199213 // Thread end branch (stop the entire thread, including procedure callers)
200214 m_builder.SetInsertPoint (m_endThreadBranch);
215+ popStringStack ();
201216
202217 switch (m_codeType) {
203218 case Compiler::CodeType::Script:
@@ -497,15 +512,11 @@ llvm::Value *LLVMBuildUtils::addAlloca(llvm::Type *type)
497512
498513llvm::Value *LLVMBuildUtils::addStringAlloca ()
499514{
500- // All temporary strings are allocated before the script is called
501- llvm::BasicBlock *block = m_builder.GetInsertBlock ();
502- m_builder.SetInsertPoint (m_stringAllocaBlock);
503-
515+ // All temporary strings are allocated when the string stack is pushed
516+ llvm::Value *stringArray = m_builder.CreateLoad (m_stringPtrType->getPointerTo (), m_stringArrayVar, " loadedStringArray" );
504517 llvm::Value *index = m_builder.getInt64 (m_stringCount++);
505- llvm::Value *elementPtr = m_builder.CreateGEP (m_stringPtrType->getPointerTo (), m_stringArray , index);
518+ llvm::Value *elementPtr = m_builder.CreateGEP (m_stringPtrType->getPointerTo (), stringArray , index);
506519 llvm::Value *ret = m_builder.CreateLoad (m_stringPtrType->getPointerTo (), elementPtr, " localString" );
507-
508- m_builder.SetInsertPoint (block);
509520 return ret;
510521}
511522
@@ -1417,10 +1428,14 @@ void LLVMBuildUtils::createSuspend()
14171428 m_builder.SetInsertPoint (suspendBranch);
14181429 }
14191430
1431+ popStringStack ();
14201432 syncVariables ();
1433+
14211434 m_coroutine->createSuspend ();
1435+
14221436 reloadVariables ();
14231437 reloadLists ();
1438+ pushStringStack ();
14241439
14251440 if (m_warpArg) {
14261441 m_builder.CreateBr (nextBranch);
@@ -2190,3 +2205,15 @@ llvm::Value *LLVMBuildUtils::getListDataPtr(const LLVMListPtr &listPtr)
21902205{
21912206 return m_builder.CreateLoad (m_valueDataType->getPointerTo (), m_builder.CreateLoad (m_valueDataType->getPointerTo ()->getPointerTo (), listPtr.dataPtr ));
21922207}
2208+
2209+ void LLVMBuildUtils::pushStringStack ()
2210+ {
2211+ llvm::Value *stringCount = m_builder.CreateLoad (m_builder.getInt64Ty (), m_stringCountVar, " strCount" );
2212+ llvm::Value *strings = m_builder.CreateCall (m_functions.resolve_llvm_push_string_stack (), { m_executionContextPtr, stringCount });
2213+ m_builder.CreateStore (strings, m_stringArrayVar);
2214+ }
2215+
2216+ void LLVMBuildUtils::popStringStack ()
2217+ {
2218+ m_builder.CreateCall (m_functions.resolve_llvm_pop_string_stack (), { m_executionContextPtr });
2219+ }
0 commit comments