Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 19:48:20 +02:00
Code Activity

Fixed const-eval-initialized const field dependency issues

Browse source
This commit is contained in:
Brian Fiete 2021-01-02 15:46:29 -08:00
parent 1893988195
commit 496eae24ad
5 changed files with 85 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
IDEHelper/Compiler/BfModule.cpp
View file

@ -4088,6 +4088,10 @@ BfTypedValue BfModule::GetFieldInitializerValue(BfFieldInstance* fieldInstance,
}
else if (fieldDef->mIsConst)
{
int ceExecuteId = -1;
if (mCompiler->mCEMachine != NULL)
ceExecuteId = mCompiler->mCEMachine->mExecuteId;
BfTypeState typeState;
typeState.mTypeInstance = mCurTypeInstance;
typeState.mCurTypeDef = fieldDef->mDeclaringType;
@ -4108,8 +4112,14 @@ BfTypedValue BfModule::GetFieldInitializerValue(BfFieldInstance* fieldInstance,
resolveFlags = BfConstResolveFlag_NoCast;
}
UpdateSrcPos(initializer);
return constResolver.Resolve(initializer, fieldType, resolveFlags);
}
auto result = constResolver.Resolve(initializer, fieldType, resolveFlags);
if (mCompiler->mCEMachine != NULL)
{
if (mCompiler->mCEMachine->mExecuteId != ceExecuteId)
fieldInstance->mHadConstEval = true;
}
return result;
}
}
BfExprEvaluator exprEvaluator(this);