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

More deleted type improvements

Browse source
This commit is contained in:
Brian Fiete 2025-03-21 16:34:31 -04:00
parent a240acc674
commit c25f750bd5
2 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
IDEHelper/Compiler/BfModule.cpp
View file

@ -1294,7 +1294,11 @@ void BfModule::SetupIRBuilder(bool dbgVerifyCodeGen)
void BfModule::EnsureIRBuilder(bool dbgVerifyCodeGen) void BfModule::EnsureIRBuilder(bool dbgVerifyCodeGen)
{ {
BF_ASSERT(!mIsDeleting); if (mIsDeleting)
{
mCompiler->RequestExtraCompile();
InternalError("EnsureIRBuilder on deleted module");
}
if (mBfIRBuilder == NULL) if (mBfIRBuilder == NULL)
{ {

24
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -740,7 +740,15 @@ void BfModule::InitType(BfType* resolvedTypeRef, BfPopulateType populateType)
auto genericTypeInst = (BfTypeInstance*)resolvedTypeRef; auto genericTypeInst = (BfTypeInstance*)resolvedTypeRef;
for (auto typeGenericArg : genericTypeInst->mGenericTypeInfo->mTypeGenericArguments) for (auto typeGenericArg : genericTypeInst->mGenericTypeInfo->mTypeGenericArguments)
{ {
BF_ASSERT((typeGenericArg->mRebuildFlags & BfTypeRebuildFlag_Deleted) == 0); //BF_ASSERT((typeGenericArg->mRebuildFlags & BfTypeRebuildFlag_Deleted) == 0);
if ((typeGenericArg->mRebuildFlags & BfTypeRebuildFlag_Deleted) != 0)
{
mCompiler->RequestExtraCompile();
InternalError("Using deleted generic type argument in PopulateType");
TypeFailed(genericTypeInst);
return;
}
if (mIsReified) if (mIsReified)
{ {
// Try to reify any generic args // Try to reify any generic args
@ -1040,6 +1048,8 @@ void BfModule::TypeFailed(BfTypeInstance* typeInstance)
typeInstance->mAlign = 1; typeInstance->mAlign = 1;
if (typeInstance->mSize == -1) if (typeInstance->mSize == -1)
typeInstance->mSize = 1; typeInstance->mSize = 1;
if (typeInstance->mContext == NULL)
typeInstance->mContext = mContext;
mContext->mFailTypes.TryAdd(typeInstance, BfFailKind_Normal); mContext->mFailTypes.TryAdd(typeInstance, BfFailKind_Normal);
mHadBuildError = true; mHadBuildError = true;
} }
@ -11995,6 +12005,12 @@ BfType* BfModule::ResolveTypeRef_Ref(BfTypeReference* typeRef, BfPopulateType po
if ((outerTypeInstance != NULL) && (typeDef->mGenericParamDefs.size() != 0)) if ((outerTypeInstance != NULL) && (typeDef->mGenericParamDefs.size() != 0))
{ {
// Try to inherit generic params from current parent // Try to inherit generic params from current parent
if (outerTypeInstance->IsDeleting())
{
mCompiler->RequestExtraCompile();
InternalError("ResolveTypeRef with deleted outer type");
return ResolveTypeResult(typeRef, NULL, populateType, resolveFlags);
}
BfTypeDef* outerType = mSystem->GetCombinedPartial(typeDef->mOuterType); BfTypeDef* outerType = mSystem->GetCombinedPartial(typeDef->mOuterType);
BF_ASSERT(!outerType->mIsPartial); BF_ASSERT(!outerType->mIsPartial);
@ -16034,6 +16050,12 @@ void BfModule::DoTypeToString(StringImpl& str, BfType* resolvedType, BfTypeNameF
{ {
BP_ZONE("BfModule::DoTypeToString"); BP_ZONE("BfModule::DoTypeToString");
if (resolvedType->mContext == NULL)
{
str += "*UNINITIALIZED TYPE*";
return;
}
if ((typeNameFlags & BfTypeNameFlag_AddProjectName) != 0) if ((typeNameFlags & BfTypeNameFlag_AddProjectName) != 0)
{ {
BfProject* defProject = NULL; BfProject* defProject = NULL;