PrepareFunction fix during reentry (error condition)

beefytech · Nov 20, 2021 · dc57db2 · dc57db2
1 parent 238def6
commit dc57db2
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/IDEHelper/Compiler/CeMachine.cpp b/IDEHelper/Compiler/CeMachine.cpp
@@ -5466,6 +5466,7 @@ bool CeContext::Execute(CeFunction* startFunction, uint8* startStackPtr, uint8*
 				{
 					auto curFrame = _GetCurFrame();
 					SetAndRestoreValue<CeFrame*> prevFrame(mCurFrame, &curFrame);
+					BF_ASSERT(!callEntry.mFunction->mInitialized);
 					mCeMachine->PrepareFunction(callEntry.mFunction, NULL);
 				}
 
@@ -6915,8 +6916,14 @@ void CeMachine::PrepareFunction(CeFunction* ceFunction, CeBuilder* parentBuilder
 	AutoTimer autoTimer(mRevisionExecuteTime);
 	SetAndRestoreValue<CeFunction*> prevCEFunction(mPreparingFunction, ceFunction);	
 
+	BF_ASSERT(!ceFunction->mInitialized);
+
 	if (ceFunction->mFunctionKind == CeFunctionKind_NotSet)
-		CheckFunctionKind(ceFunction);		
+	{
+		CheckFunctionKind(ceFunction);
+		if (ceFunction->mInitialized)
+			return;
+	}
 
 	BF_ASSERT(!ceFunction->mInitialized);
 	ceFunction->mInitialized = true;