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 dependency issues

Browse source
This commit is contained in:
Brian Fiete 2020-12-31 11:31:19 -08:00
parent fa65029dfa
commit 86b5e65015
9 changed files with 82 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
IDEHelper/Compiler/BfCompiler.cpp
View file

@ -2175,6 +2175,8 @@ void BfCompiler::UpdateDependencyMap(bool deleteUnusued, bool& didWork)
}
}
depType->mDependencyMap.mFlagsUnion = BfDependencyMap::DependencyFlag_None;
// Not combined with previous loop because PopulateType could modify typeInst->mDependencyMap
for (auto itr = depType->mDependencyMap.begin(); itr != depType->mDependencyMap.end();)
{
@ -2240,6 +2242,8 @@ void BfCompiler::UpdateDependencyMap(bool deleteUnusued, bool& didWork)
++itr;
}
depType->mDependencyMap.mFlagsUnion = (BfDependencyMap::DependencyFlags)(depType->mDependencyMap.mFlagsUnion | depData.mFlags);
}
if ((!depType->IsGenericTypeInstance() && (!depType->IsBoxed())) ||
@ -3336,6 +3340,13 @@ void BfCompiler::UpdateRevisedTypes()
(compositeTypeDef->mDefState != BfTypeDef::DefState_InlinedInternals_Changed))
compositeTypeDef->mDefState = BfTypeDef::DefState_Internals_Changed;
}
else if (checkTypeDef->mDefState == BfTypeDef::DefState_Refresh)
{
if ((compositeTypeDef->mDefState != BfTypeDef::DefState_Signature_Changed) &&
(compositeTypeDef->mDefState != BfTypeDef::DefState_InlinedInternals_Changed) &&
(compositeTypeDef->mDefState != BfTypeDef::DefState_Internals_Changed))
compositeTypeDef->mDefState = BfTypeDef::DefState_Refresh;
}
BF_ASSERT(checkTypeDef->mIsPartial);
if (checkTypeDef->mNextRevision != NULL)

30
IDEHelper/Compiler/BfContext.cpp
View file

@ -1219,13 +1219,36 @@ void BfContext::TypeInlineMethodInternalsChanged(BfTypeInstance* typeInst)
auto dependencyFlags = depItr.mValue.mFlags;
// We don't need to cascade rebuilding for method-based usage - just rebuild the type directly (unlike TypeDataChanged, which cascades)
if (dependencyFlags & BfDependencyMap::DependencyFlag_InlinedCall)
if ((dependencyFlags & BfDependencyMap::DependencyFlag_InlinedCall) != 0)
{
RebuildType(dependentType);
}
}
}
void BfContext::TypeConstEvalChanged(BfTypeInstance* typeInst)
{
if (typeInst->mRebuildFlags & BfTypeRebuildFlag_ConstEvalChange) // Already did change?
return;
typeInst->mRebuildFlags = (BfTypeRebuildFlags)(typeInst->mRebuildFlags | BfTypeRebuildFlag_ConstEvalChange);
// These don't happen in TypeDataChanged because we don't need to cascade
for (auto& depItr : typeInst->mDependencyMap)
{
auto dependentType = depItr.mKey;
auto dependencyFlags = depItr.mValue.mFlags;
// We don't need to cascade rebuilding for method-based usage - just rebuild the type directly (unlike TypeDataChanged, which cascades)
if ((dependencyFlags & BfDependencyMap::DependencyFlag_ConstEval) != 0)
{
auto depTypeInst = dependentType->ToTypeInstance();
if (depTypeInst != NULL)
TypeConstEvalChanged(depTypeInst);
RebuildType(dependentType);
}
}
}
void BfContext::PopulateHotTypeDataVTable(BfTypeInstance* typeInstance)
{
BP_ZONE("BfContext::PopulateHotTypeDataVTable");
@ -1870,6 +1893,11 @@ void BfContext::UpdateRevisedTypes()
isSignatureChange = true;
}
if ((typeDef->mDefState != BfTypeDef::DefState_Refresh) && ((typeInst->mDependencyMap.mFlagsUnion & BfDependencyMap::DependencyFlag_ConstEval) != 0))
{
TypeConstEvalChanged(typeInst);
}
if (isSignatureChange)
{
TypeDataChanged(typeInst, true);

1
IDEHelper/Compiler/BfContext.h
View file

@ -441,6 +441,7 @@ public:
void TypeDataChanged(BfDependedType* dType, bool isNonStaticDataChange);
void TypeMethodSignaturesChanged(BfTypeInstance* typeInst);
void TypeInlineMethodInternalsChanged(BfTypeInstance* typeInst);
void TypeConstEvalChanged(BfTypeInstance* typeInst);
void CheckSpecializedErrorData();
void TryUnreifyModules();
void MarkUsedModules(BfProject* project, BfModule* module);

7
IDEHelper/Compiler/BfDefBuilder.cpp
View file

@ -1841,7 +1841,9 @@ void BfDefBuilder::Visit(BfTypeDeclaration* typeDeclaration)
{
BF_ASSERT(mCurTypeDef->mTypeCode == prevRevisionTypeDef->mTypeCode);
if ((mCurTypeDef->mFullHash == prevRevisionTypeDef->mFullHash) && (!mFullRefresh))
if (mCurTypeDef->mFullHash == prevRevisionTypeDef->mFullHash)
{
if (!mFullRefresh)
{
BfLogSys(bfParser->mSystem, "DefBuilder deleting typeDef with no changes %p\n", prevRevisionTypeDef);
prevRevisionTypeDef->mDefState = BfTypeDef::DefState_Defined;
@ -1850,6 +1852,9 @@ void BfDefBuilder::Visit(BfTypeDeclaration* typeDeclaration)
delete mCurTypeDef;
mCurTypeDef = NULL;
}
else
prevRevisionTypeDef->mDefState = BfTypeDef::DefState_Refresh;
}
else if (mCurTypeDef->mSignatureHash != prevRevisionTypeDef->mSignatureHash)
prevRevisionTypeDef->mDefState = BfTypeDef::DefState_Signature_Changed;
else if (mCurTypeDef->mInlineHash != prevRevisionTypeDef->mInlineHash)

24
IDEHelper/Compiler/BfResolvedTypeUtils.h
View file

@ -109,6 +109,7 @@ public:
DependencyFlag_NameReference = 0x400000,
DependencyFlag_VirtualCall = 0x800000,
DependencyFlag_WeakReference = 0x1000000, // Keeps alive but won't rebuild
DependencyFlag_ConstEval = 0x2000000,
DependencyFlag_DependentUsageMask = ~(DependencyFlag_UnspecializedType | DependencyFlag_MethodGenericArg | DependencyFlag_GenericArgRef)
};
@ -127,6 +128,7 @@ public:
public:
typedef Dictionary<BfType*, DependencyEntry> TypeMap;
DependencyFlags mFlagsUnion;
TypeMap mTypeSet;
int mMinDependDepth;
@ -134,6 +136,7 @@ public:
BfDependencyMap()
{
mMinDependDepth = 0;
mFlagsUnion = DependencyFlag_None;
}
bool AddUsedBy(BfType* dependentType, DependencyFlags flags);
@ -401,16 +404,17 @@ enum BfTypeRebuildFlags
BfTypeRebuildFlag_NonStaticChange = 2,
BfTypeRebuildFlag_MethodInlineInternalsChange = 4,
BfTypeRebuildFlag_MethodSignatureChange = 8,
BfTypeRebuildFlag_DeleteQueued = 0x10,
BfTypeRebuildFlag_Deleted = 0x20,
BfTypeRebuildFlag_AddedToWorkList = 0x40,
BfTypeRebuildFlag_AwaitingReference = 0x80,
BfTypeRebuildFlag_SpecializedMethodRebuild = 0x100, // Temporarily set
BfTypeRebuildFlag_SpecializedByAutocompleteMethod = 0x200,
BfTypeRebuildFlag_UnderlyingTypeDeferred = 0x400,
BfTypeRebuildFlag_TypeDataSaved = 0x800,
BfTypeRebuildFlag_InTempPool = 0x1000,
BfTypeRebuildFlag_ResolvingBase = 0x2000
BfTypeRebuildFlag_ConstEvalChange = 0x10,
BfTypeRebuildFlag_DeleteQueued = 0x20,
BfTypeRebuildFlag_Deleted = 0x40,
BfTypeRebuildFlag_AddedToWorkList = 0x80,
BfTypeRebuildFlag_AwaitingReference = 0x100,
BfTypeRebuildFlag_SpecializedMethodRebuild = 0x200, // Temporarily set
BfTypeRebuildFlag_SpecializedByAutocompleteMethod = 0x400,
BfTypeRebuildFlag_UnderlyingTypeDeferred = 0x800,
BfTypeRebuildFlag_TypeDataSaved = 0x1000,
BfTypeRebuildFlag_InTempPool = 0x2000,
BfTypeRebuildFlag_ResolvingBase = 0x4000
};
class BfTypeDIReplaceCallback;

2
IDEHelper/Compiler/BfSystem.cpp
View file

@ -3053,6 +3053,8 @@ void BfSystem::FinishCompositePartial(BfTypeDef* compositeTypeDef)
compositeTypeDef->mDefState = BfTypeDef::DefState_InlinedInternals_Changed;
else if ((nextRevision->mDefState == BfTypeDef::DefState_Internals_Changed) || (compositeTypeDef->mFullHash != nextRevision->mFullHash))
compositeTypeDef->mDefState = BfTypeDef::DefState_Internals_Changed;
else if (nextRevision->mDefState == BfTypeDef::DefState_Refresh)
compositeTypeDef->mDefState = BfTypeDef::DefState_Refresh;
//InjectNewRevision(compositeTypeDef);
VerifyTypeDef(compositeTypeDef);

1
IDEHelper/Compiler/BfSystem.h
View file

@ -908,6 +908,7 @@ public:
DefState_Signature_Changed,
DefState_InlinedInternals_Changed, // Code within methods, including inlined methods, changed
DefState_Internals_Changed, // Only code within a non-inlined methods changed
DefState_Refresh,
DefState_Deleted
};

7
IDEHelper/Compiler/CeMachine.cpp
View file

@ -2630,6 +2630,7 @@ CeMachine::CeMachine(BfCompiler* compiler)
mCurFunctionId = 0;
mRevisionExecuteTime = 0;
mCurTargetSrc = NULL;
mCurCEFunction = NULL;
mCurModule = NULL;
mCurMethodInstance = NULL;
mCurExpectingType = NULL;
@ -5243,6 +5244,7 @@ bool CeMachine::Execute(CeFunction* startFunction, uint8* startStackPtr, uint8*
void CeMachine::PrepareFunction(CeFunction* ceFunction, CeBuilder* parentBuilder)
{
AutoTimer autoTimer(mRevisionExecuteTime);
SetAndRestoreValue<CeFunction*> prevCEFunction(mCurCEFunction, ceFunction);
if (mHeap == NULL)
mHeap = new ContiguousHeap();
@ -5442,6 +5444,9 @@ CeFunction* CeMachine::GetPreparedFunction(BfMethodInstance* methodInstance)
void CeMachine::QueueMethod(BfMethodInstance* methodInstance, BfIRValue func)
{
auto curOwner = mCurCEFunction->mMethodInstance->GetOwner();
curOwner->mModule->AddDependency(methodInstance->GetOwner(), curOwner, BfDependencyMap::DependencyFlag_ConstEval);
bool added = false;
auto ceFunction = GetFunction(methodInstance, func, added);
}
@ -5738,5 +5743,7 @@ BfTypedValue CeMachine::Call(BfAstNode* targetSrc, BfModule* module, BfMethodIns
mStaticFieldMap.Clear();
mHeap->Clear(BF_CE_MAX_CARRYOVER_HEAP);
module->AddDependency(methodInstance->GetOwner(), module->mCurTypeInstance, BfDependencyMap::DependencyFlag_ConstEval);
return returnValue;
}

1
IDEHelper/Compiler/CeMachine.h
View file

@ -627,6 +627,7 @@ public:
HashSet<int> mStaticCtorExecSet;
CeAppendAllocInfo* mAppendAllocInfo;
CeFunction* mCurCEFunction;
BfAstNode* mCurTargetSrc;
BfMethodInstance* mCurMethodInstance;
BfModule* mCurModule;