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

Fixed type generic arg and PopulateType dependency bugs

Browse source
This commit is contained in:
Brian Fiete 2022-06-02 07:06:31 -07:00
parent a77a95b71b
commit 7e94abe43a
5 changed files with 77 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

16
IDEHelper/Compiler/BfCompiler.cpp
View file

@ -2307,14 +2307,14 @@ void BfCompiler::UpdateDependencyMap(bool deleteUnusued, bool& didWork)
for (auto type : mContext->mResolvedTypes) for (auto type : mContext->mResolvedTypes)
{ {
if (type != NULL) if (type != NULL)
{ {
auto depType = type->ToDependedType(); auto depType = type->ToDependedType();
auto typeInst = type->ToTypeInstance(); auto typeInst = type->ToTypeInstance();
if (depType != NULL) if (depType != NULL)
{ {
extern BfModule* gLastCreatedModule; extern BfModule* gLastCreatedModule;
#ifdef _DEBUG #ifdef _DEBUG
for (auto itr = depType->mDependencyMap.begin(); itr != depType->mDependencyMap.end(); ++itr) for (auto itr = depType->mDependencyMap.begin(); itr != depType->mDependencyMap.end(); ++itr)
{ {
@ -2334,7 +2334,7 @@ void BfCompiler::UpdateDependencyMap(bool deleteUnusued, bool& didWork)
auto dependentType = itr->mKey; auto dependentType = itr->mKey;
auto depTypeInst = dependentType->ToTypeInstance(); auto depTypeInst = dependentType->ToTypeInstance();
auto& depData = itr->mValue; auto& depData = itr->mValue;
bool isInvalidVersion = (dependentType->mRevision > depData.mRevision);// && (deleteUnusued) && (madeFullPass); bool isInvalidVersion = (dependentType->mRevision > depData.mRevision);// && (deleteUnusued) && (madeFullPass);
//TODO: Just to cause crash if dependentType is deleted //TODO: Just to cause crash if dependentType is deleted
@ -2491,7 +2491,7 @@ void BfCompiler::UpdateDependencyMap(bool deleteUnusued, bool& didWork)
{ {
// This flag should be handled by now // This flag should be handled by now
BF_ASSERT((type->mRebuildFlags & BfTypeRebuildFlag_AwaitingReference) == 0); BF_ASSERT((type->mRebuildFlags & BfTypeRebuildFlag_AwaitingReference) == 0);
} }
} }
#endif #endif
@ -2549,7 +2549,7 @@ void BfCompiler::SanitizeDependencyMap()
auto depType = type->ToDependedType(); auto depType = type->ToDependedType();
if (depType == NULL) if (depType == NULL)
continue; continue;
// Not combined with previous loop because PopulateType could modify typeInst->mDependencyMap // Not combined with previous loop because PopulateType could modify typeInst->mDependencyMap
for (auto itr = depType->mDependencyMap.begin(); itr != depType->mDependencyMap.end();) for (auto itr = depType->mDependencyMap.begin(); itr != depType->mDependencyMap.end();)
{ {
@ -2626,7 +2626,7 @@ bool BfCompiler::VerifySlotNums()
SmallVector<BfTypeInstance*, 16> isSlotUsed; SmallVector<BfTypeInstance*, 16> isSlotUsed;
for (auto type : mContext->mResolvedTypes) for (auto type : mContext->mResolvedTypes)
{ {
if (!type->IsReified()) if (!type->IsReified())
continue; continue;

43
IDEHelper/Compiler/BfContext.cpp
View file

@ -907,25 +907,30 @@ void BfContext::ValidateDependencies()
// BfLogSysM("ValidateDependencies\n"); // BfLogSysM("ValidateDependencies\n");
// //
// bool deletedNewTypes = false; // bool deletedNewTypes = false;
// auto itr = mResolvedTypes.begin(); // for (auto type : mResolvedTypes)
// while (itr != mResolvedTypes.end()) // {
// { // if (type->IsDeleting())
// auto type = itr.mCurEntry->mValue; // continue;
// if ((type->IsGenericTypeInstance()) && (type->mDefineState > BfTypeDefineState_Undefined)) //
// if (type->IsGenericTypeInstance())
// { // {
// // We can't contain deleted generic arguments without being deleted ourselves // // We can't contain deleted generic arguments without being deleted ourselves
// BfTypeInstance* genericType = (BfTypeInstance*)type; // BfTypeInstance* genericType = (BfTypeInstance*)type;
// //
// for (auto genericTypeArg : genericType->mTypeGenericArguments) // for (auto genericTypeArg : genericType->mGenericTypeInfo->mTypeGenericArguments)
// { // {
// auto depType = genericTypeArg->ToDependedType(); // BF_ASSERT((!genericTypeArg->IsDeleting()));
// if (depType != NULL) //
// auto argDepType = genericTypeArg->ToDependedType();
// if (argDepType != NULL)
// { // {
// BF_ASSERT(depType->mDependencyMap.mTypeSet.ContainsKey(type)); // BfDependencyMap::DependencyEntry* depEntry = NULL;
// argDepType->mDependencyMap.mTypeSet.TryGetValue(type, &depEntry);
// BF_ASSERT(depEntry != NULL);
// BF_ASSERT((depEntry->mFlags & BfDependencyMap::DependencyFlag_TypeGenericArg) != 0);
// } // }
// } // }
// } // }
// ++itr;
// } // }
#endif #endif
} }
@ -979,6 +984,11 @@ void BfContext::RebuildType(BfType* type, bool deleteOnDemandTypes, bool rebuild
{ {
BfLogSysM("Setting revision. Type: %p Revision: %d\n", typeInst, mCompiler->mRevision); BfLogSysM("Setting revision. Type: %p Revision: %d\n", typeInst, mCompiler->mRevision);
typeInst->mRevision = mCompiler->mRevision; typeInst->mRevision = mCompiler->mRevision;
if (typeInst->IsGenericTypeInstance())
{
BfLogSysM("Setting BfTypeRebuildFlag_PendingGenericArgDep for type %p\n", typeInst);
typeInst->mRebuildFlags = (BfTypeRebuildFlags)(typeInst->mRebuildFlags | BfTypeRebuildFlag_PendingGenericArgDep);
}
} }
if ((typeInst->IsTypeAlias()) != (typeInst->mTypeDef->mTypeCode == BfTypeCode_TypeAlias)) if ((typeInst->IsTypeAlias()) != (typeInst->mTypeDef->mTypeCode == BfTypeCode_TypeAlias))
@ -1970,6 +1980,15 @@ void BfContext::UpdateAfterDeletingTypes()
for (auto genericTypeArg : genericType->mGenericTypeInfo->mTypeGenericArguments) for (auto genericTypeArg : genericType->mGenericTypeInfo->mTypeGenericArguments)
{ {
BF_ASSERT((!genericTypeArg->IsDeleting())); BF_ASSERT((!genericTypeArg->IsDeleting()));
auto argDepType = genericTypeArg->ToDependedType();
if (argDepType != NULL)
{
BfDependencyMap::DependencyEntry* depEntry = NULL;
argDepType->mDependencyMap.mTypeSet.TryGetValue(type, &depEntry);
BF_ASSERT(depEntry != NULL);
BF_ASSERT((depEntry->mFlags & BfDependencyMap::DependencyFlag_TypeGenericArg) != 0);
}
} }
} }
#endif #endif
@ -2176,7 +2195,7 @@ void BfContext::UpdateRevisedTypes()
} }
// Clear flags we don't want to propagate // Clear flags we don't want to propagate
typeInst->mRebuildFlags = (BfTypeRebuildFlags)(typeInst->mRebuildFlags & BfTypeRebuildFlag_UnderlyingTypeDeferred); typeInst->mRebuildFlags = (BfTypeRebuildFlags)(typeInst->mRebuildFlags & (BfTypeRebuildFlag_UnderlyingTypeDeferred | BfTypeRebuildFlag_PendingGenericArgDep));
if (typeDef->mIsPartial) if (typeDef->mIsPartial)
{ {

56
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -1142,7 +1142,15 @@ void BfModule::PopulateType(BfType* resolvedTypeRef, BfPopulateType populateType
{ {
if ((populateType == BfPopulateType_Declaration) && (resolvedTypeRef->mDefineState >= BfTypeDefineState_Declared)) if ((populateType == BfPopulateType_Declaration) && (resolvedTypeRef->mDefineState >= BfTypeDefineState_Declared))
return; return;
if ((resolvedTypeRef->mRebuildFlags & BfTypeRebuildFlag_PendingGenericArgDep) != 0)
{
BfLogSysM("PopulateType handling BfTypeRebuildFlag_PendingGenericArgDep for type %p\n", resolvedTypeRef);
// Reinit dependencies
resolvedTypeRef->mRebuildFlags = (BfTypeRebuildFlags)(resolvedTypeRef->mRebuildFlags & ~BfTypeRebuildFlag_PendingGenericArgDep);
DoPopulateType_SetGenericDependencies(resolvedTypeRef->ToTypeInstance());
}
// Are we "demanding" to reify a type that is currently resolve-only? // Are we "demanding" to reify a type that is currently resolve-only?
if ((mIsReified) && (populateType >= BfPopulateType_Declaration)) if ((mIsReified) && (populateType >= BfPopulateType_Declaration))
{ {
@ -1252,23 +1260,15 @@ void BfModule::PopulateType(BfType* resolvedTypeRef, BfPopulateType populateType
if (populateType <= BfPopulateType_TypeDef) if (populateType <= BfPopulateType_TypeDef)
return; return;
auto typeInstance = resolvedTypeRef->ToTypeInstance(); auto typeInstance = resolvedTypeRef->ToTypeInstance();
CheckInjectNewRevision(typeInstance); CheckInjectNewRevision(typeInstance);
BF_ASSERT((resolvedTypeRef->mRebuildFlags & (BfTypeRebuildFlag_Deleted | BfTypeRebuildFlag_DeleteQueued)) == 0); SetAndRestoreValue<BfTypeInstance*> prevTypeInstance(mCurTypeInstance, typeInstance);
SetAndRestoreValue<BfMethodInstance*> prevMethodInstance(mCurMethodInstance, NULL);
SetAndRestoreValue<BfMethodState*> prevMethodState(mCurMethodState, NULL);
/*BfTypeRebuildFlags allowedFlags = (BfTypeRebuildFlags)(BfTypeRebuildFlag_AddedToWorkList | BfTypeRebuildFlag_AwaitingReference | BfTypeRebuildFlag_UnderlyingTypeDeferred); BF_ASSERT((resolvedTypeRef->mRebuildFlags & (BfTypeRebuildFlag_Deleted | BfTypeRebuildFlag_DeleteQueued)) == 0);
if ((resolvedTypeRef->mRebuildFlags & ~allowedFlags) != 0)
{
// BfContext::UpdateAfterDeletingTypes should clear out all flags except for the Deleted flag
// If this type was deleted then we should never be able to reach PopulateType here.
// This may happen if dependent types were not properly rebuilt when a used type
// was deleted.
auto hadFlags = resolvedTypeRef->mRebuildFlags;
BF_ASSERT((resolvedTypeRef->mRebuildFlags & ~allowedFlags) == 0);
resolvedTypeRef->mRebuildFlags = (BfTypeRebuildFlags)(resolvedTypeRef->mRebuildFlags & ~allowedFlags);
}*/
bool isNew = resolvedTypeRef->mDefineState == BfTypeDefineState_Undefined; bool isNew = resolvedTypeRef->mDefineState == BfTypeDefineState_Undefined;
if (isNew) if (isNew)
@ -3076,15 +3076,31 @@ void BfModule::DoCEEmit(BfMethodInstance* methodInstance)
void BfModule::DoPopulateType_SetGenericDependencies(BfTypeInstance* genericTypeInstance) void BfModule::DoPopulateType_SetGenericDependencies(BfTypeInstance* genericTypeInstance)
{ {
SetAndRestoreValue<BfTypeInstance*> prevTypeInstance(mCurTypeInstance, genericTypeInstance);
SetAndRestoreValue<BfMethodInstance*> prevMethodInstance(mCurMethodInstance, NULL);
SetAndRestoreValue<BfMethodState*> prevMethodState(mCurMethodState, NULL);
// Add generic dependencies if needed // Add generic dependencies if needed
for (auto genericType : genericTypeInstance->mGenericTypeInfo->mTypeGenericArguments) for (auto genericArgType : genericTypeInstance->mGenericTypeInfo->mTypeGenericArguments)
{ {
if (genericType->IsPrimitiveType()) if (genericArgType->IsPrimitiveType())
genericType = GetWrappedStructType(genericType); genericArgType = GetWrappedStructType(genericArgType);
if (genericType != NULL) if (genericArgType != NULL)
{ {
AddDependency(genericType, genericTypeInstance, BfDependencyMap::DependencyFlag_TypeGenericArg); AddDependency(genericArgType, genericTypeInstance, BfDependencyMap::DependencyFlag_TypeGenericArg);
BfLogSysM("Adding generic dependency of %p for type %p\n", genericType, genericTypeInstance); BfLogSysM("Adding generic dependency of %p for type %p revision %d\n", genericArgType, genericTypeInstance, genericTypeInstance->mRevision);
#ifdef _DEBUG
// auto argDepType = genericArgType->ToDependedType();
// if (argDepType != NULL)
// {
// BfDependencyMap::DependencyEntry* depEntry = NULL;
// argDepType->mDependencyMap.mTypeSet.TryGetValue(genericTypeInstance, &depEntry);
// BF_ASSERT(depEntry != NULL);
// BF_ASSERT(depEntry->mRevision == genericTypeInstance->mRevision);
// BF_ASSERT((depEntry->mFlags & BfDependencyMap::DependencyFlag_TypeGenericArg) != 0);
// }
#endif
} }
} }
if ((genericTypeInstance->IsSpecializedType()) && if ((genericTypeInstance->IsSpecializedType()) &&

2
IDEHelper/Compiler/BfResolvedTypeUtils.cpp
View file

@ -117,7 +117,7 @@ bool BfDependencyMap::AddUsedBy(BfType* dependentType, BfDependencyMap::Dependen
{ {
if ((dependencyEntry->mFlags & flags) == flags) if ((dependencyEntry->mFlags & flags) == flags)
return false; return false;
dependencyEntry->mFlags = (BfDependencyMap::DependencyFlags)(dependencyEntry->mFlags | flags); dependencyEntry->mFlags = (DependencyFlags)(dependencyEntry->mFlags | flags);
return true; return true;
} }
} }

1
IDEHelper/Compiler/BfResolvedTypeUtils.h
View file

@ -447,6 +447,7 @@ enum BfTypeRebuildFlags
BfTypeRebuildFlag_RebuildQueued = 0x20000, BfTypeRebuildFlag_RebuildQueued = 0x20000,
BfTypeRebuildFlag_ConstEvalCancelled = 0x40000, BfTypeRebuildFlag_ConstEvalCancelled = 0x40000,
BfTypeRebuildFlag_ChangedMidCompile = 0x80000, BfTypeRebuildFlag_ChangedMidCompile = 0x80000,
BfTypeRebuildFlag_PendingGenericArgDep = 0x100000
}; };
class BfTypeDIReplaceCallback; class BfTypeDIReplaceCallback;