Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-14 14:24:10 +02:00
Code Activity

Fixed comptime TypeDone type population reentracy issue

Browse source
This commit is contained in:
Brian Fiete 2021-11-23 12:09:28 -08:00
parent 1536c89d63
commit f1105a8ce1
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -2361,7 +2361,11 @@ void BfModule::ExecuteCEOnCompile(CeEmitContext* ceEmitContext, BfTypeInstance*
auto methodInstance = GetRawMethodInstanceAtIdx(typeInstance, methodDef->mIdx); auto methodInstance = GetRawMethodInstanceAtIdx(typeInstance, methodDef->mIdx);
auto result = mCompiler->mCEMachine->Call(methodDef->GetRefNode(), this, methodInstance, {}, (CeEvalFlags)(CeEvalFlags_PersistantError | CeEvalFlags_DeferIfNotOnlyError), NULL); auto result = mCompiler->mCEMachine->Call(methodDef->GetRefNode(), this, methodInstance, {}, (CeEvalFlags)(CeEvalFlags_PersistantError | CeEvalFlags_DeferIfNotOnlyError), NULL);
if (typeInstance->mDefineState != BfTypeDefineState_CETypeInit) if ((onCompileKind == BfCEOnCompileKind_TypeDone) && (typeInstance->mDefineState > BfTypeDefineState_CETypeInit))
{
// Type done, okay
}
else if (typeInstance->mDefineState != BfTypeDefineState_CETypeInit)
{ {
// We populated before we could finish // We populated before we could finish
AssertErrorState(); AssertErrorState();
@ -4530,7 +4534,11 @@ void BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
{ {
typeInstance->mDefineState = BfTypeDefineState_Defined; typeInstance->mDefineState = BfTypeDefineState_Defined;
if (!typeInstance->IsBoxed()) if (!typeInstance->IsBoxed())
{
ExecuteCEOnCompile(NULL, typeInstance, BfCEOnCompileKind_TypeDone); ExecuteCEOnCompile(NULL, typeInstance, BfCEOnCompileKind_TypeDone);
if (typeInstance->mDefineState == BfTypeDefineState_DefinedAndMethodsSlotted)
return;
}
} }
if (typeInstance->mTypeFailed) if (typeInstance->mTypeFailed)