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

Improved comptime circular data reference issues

Browse source
This commit is contained in:
Brian Fiete 2025-01-18 09:31:29 -08:00
parent 910f560380
commit 79e98fe9f7
7 changed files with 161 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

48
IDEHelper/Compiler/CeMachine.cpp
View file

@ -3587,6 +3587,7 @@ CeContext::CeContext()
mReflectTypeIdOffset = -1;
mExecuteId = -1;
mStackSize = -1;
mRecursiveDepth = -1;
mCurCallSource = NULL;
mHeap = new ContiguousHeap();
@ -5194,7 +5195,7 @@ BfTypedValue CeContext::Call(CeCallSource callSource, BfModule* module, BfMethod
SetAndRestoreValue<BfMethodInstance*> moduleCurMethodInstance(module->mCurMethodInstance, methodInstance);
SetAndRestoreValue<BfTypeInstance*> moduleCurTypeInstance(module->mCurTypeInstance, methodInstance->GetOwner());
SetAndRestoreValue<int> prevCurExecuteId(mCurModule->mCompiler->mCurCEExecuteId, mCeMachine->mExecuteId);
SetAndRestoreValue<int> prevCurExecuteId(mCurModule->mCompiler->mCurCEExecuteId, mCeMachine->mExecuteId);
// Reentrancy may occur as methods need defining
//SetAndRestoreValue<BfMethodState*> prevMethodStateInConstEval(module->mCurMethodState, NULL);
@ -9414,6 +9415,7 @@ CeMachine::CeMachine(BfCompiler* compiler)
mCurContext = NULL;
mCurCallSource = NULL;
mExecuteId = -1;
mCurRecursiveDepth = 0;
mCurFunctionId = 0;
mRevisionExecuteTime = 0;
@ -10305,10 +10307,12 @@ void CeMachine::PrepareFunction(CeFunction* ceFunction, CeBuilder* parentBuilder
CeBuilder ceBuilder;
SetAndRestoreValue<CeBuilder*> prevBuilder(mCurBuilder, &ceBuilder);
ceBuilder.mParentBuilder = parentBuilder;
ceBuilder.mParentBuilder = parentBuilder;
ceBuilder.mPtrSize = mCeModule->mCompiler->mSystem->mPtrSize;
ceBuilder.mCeMachine = this;
ceBuilder.mCeFunction = ceFunction;
SetAndRestoreValue<int> prevRecursiveDepth(mCurRecursiveDepth, mCurRecursiveDepth + 1);
ceBuilder.mRecursiveDepth = mCurRecursiveDepth;
ceBuilder.Build();
ceFunction->mInitializeState = CeFunction::InitializeState_Initialized;
@ -10599,8 +10603,44 @@ void CeMachine::ReleaseContext(CeContext* ceContext)
BfTypedValue CeMachine::Call(CeCallSource callSource, BfModule* module, BfMethodInstance* methodInstance, const BfSizedArray<BfIRValue>& args, CeEvalFlags flags, BfType* expectingType)
{
auto ceContext = AllocContext();
auto ceContext = AllocContext();
SetAndRestoreValue<int> prevRecursiveDepth(mCurRecursiveDepth, mCurRecursiveDepth + 1);
ceContext->mRecursiveDepth = mCurRecursiveDepth;
auto result = ceContext->Call(callSource, module, methodInstance, args, flags, expectingType);
ReleaseContext(ceContext);
return result;
}
}
BfError* CeMachine::FailCurrent(BfModule* srcModule, const StringImpl& error, BfAstNode* refNode)
{
BfError* bfError = NULL;
if ((mCurBuilder != NULL) &&
((mCurContext != NULL) || (mCurBuilder->mRecursiveDepth > mCurContext->mRecursiveDepth)))
{
String useError = error;
useError += StrFormat(" during const-eval generation of '%s'", srcModule->MethodToString(mCurBuilder->mCeFunction->mMethodInstance).c_str());
bfError = srcModule->Fail(error, refNode);
if (bfError != NULL)
{
auto filePos = mCurBuilder->mCeMachine->mCeModule->mCurFilePosition;
auto parser = filePos.mFileInstance->mParser;
if (parser != NULL)
{
srcModule->mCompiler->mPassInstance->MoreInfoAt(
StrFormat("See comptime method '%s' processing location", srcModule->MethodToString(mCurBuilder->mCeFunction->mMethodInstance).c_str()),
parser, filePos.mCurSrcPos, 1, BfFailFlag_None);
}
}
}
else
{
bfError = srcModule->Fail(error, refNode);
}
return bfError;
}
void CeMachine::FailCurrentMoreInfo(const StringImpl& error, BfAstNode* refNode)
{
}