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

Properly delete constexprs when changing target bit size

Browse source
This commit is contained in:
Brian Fiete 2020-08-25 15:27:57 -07:00
parent 630fad5b74
commit 2038d4d683
1 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

37
IDEHelper/Compiler/BfContext.cpp
View file

@ -820,7 +820,24 @@ void BfContext::RebuildType(BfType* type, bool deleteOnDemandTypes, bool rebuild
} }
type->mDirty = true; type->mDirty = true;
bool wantDeleteType = (type->IsOnDemand()) && (deleteOnDemandTypes);
if (type->IsConstExprValue())
{
auto constExprType = (BfConstExprValueType*)type;
if (constExprType->mType->mSize != mScratchModule->GetPrimitiveType(constExprType->mValue.mTypeCode)->mSize)
wantDeleteType = true;
}
if (wantDeleteType)
{
BfLogSysM("On-demand type %p attempted rebuild - deleting\n", type);
DeleteType(type);
auto depType = type->ToDependedType();
if (depType != NULL)
RebuildDependentTypes(depType);
return;
}
if (typeInst == NULL) if (typeInst == NULL)
{ {
type->mDefineState = BfTypeDefineState_Undefined; type->mDefineState = BfTypeDefineState_Undefined;
@ -858,15 +875,7 @@ void BfContext::RebuildType(BfType* type, bool deleteOnDemandTypes, bool rebuild
{ {
// The type definition failed, so we need to rebuild everyone that was depending on us // The type definition failed, so we need to rebuild everyone that was depending on us
RebuildDependentTypes(typeInst); RebuildDependentTypes(typeInst);
} }
if ((typeInst->IsOnDemand()) && (deleteOnDemandTypes))
{
BfLogSysM("On-demand type %p attempted rebuild - deleting\n", typeInst);
DeleteType(type);
RebuildDependentTypes(typeInst);
return;
}
if (typeInst->mTypeDef->mDefState == BfTypeDef::DefState_Deleted) if (typeInst->mTypeDef->mDefState == BfTypeDef::DefState_Deleted)
return; return;
@ -1701,9 +1710,15 @@ void BfContext::UpdateRevisedTypes()
auto intPtrType = mScratchModule->GetPrimitiveType(BfTypeCode_IntPtr); auto intPtrType = mScratchModule->GetPrimitiveType(BfTypeCode_IntPtr);
auto uintPtrType = mScratchModule->GetPrimitiveType(BfTypeCode_UIntPtr); auto uintPtrType = mScratchModule->GetPrimitiveType(BfTypeCode_UIntPtr);
if (intPtrType != NULL) if (intPtrType != NULL)
RebuildType(intPtrType); {
RebuildType(intPtrType);
mScratchModule->PopulateType(intPtrType);
}
if (uintPtrType != NULL) if (uintPtrType != NULL)
{
RebuildType(uintPtrType); RebuildType(uintPtrType);
mScratchModule->PopulateType(uintPtrType);
}
// Rebuild all types // Rebuild all types
for (auto type : mResolvedTypes) for (auto type : mResolvedTypes)