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

Added soft error option to GetGenericParamInstance

Browse source
This commit is contained in:
Brian Fiete 2023-12-15 11:37:53 -05:00
parent dfa03f16dd
commit e5ba928d85
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
IDEHelper/Compiler/BfModule.h
View file

@ -1942,7 +1942,7 @@ public:
BfType* ResolveSelfType(BfType* type, BfType* selfType); BfType* ResolveSelfType(BfType* type, BfType* selfType);
bool IsUnboundGeneric(BfType* type); bool IsUnboundGeneric(BfType* type);
BfGenericParamInstance* GetGenericTypeParamInstance(int paramIdx); BfGenericParamInstance* GetGenericTypeParamInstance(int paramIdx);
BfGenericParamInstance* GetGenericParamInstance(BfGenericParamType* type, bool checkMixinBind = false); BfGenericParamInstance* GetGenericParamInstance(BfGenericParamType* type, bool checkMixinBind = false, BfFailHandleKind failHandleKind = BfFailHandleKind_Normal);
void GetActiveTypeGenericParamInstances(SizedArray<BfGenericParamInstance*, 4>& genericParamInstance); void GetActiveTypeGenericParamInstances(SizedArray<BfGenericParamInstance*, 4>& genericParamInstance);
BfGenericParamInstance* GetMergedGenericParamData(BfGenericParamType* type, BfGenericParamFlags& outFlags, BfType*& outTypeConstraint); BfGenericParamInstance* GetMergedGenericParamData(BfGenericParamType* type, BfGenericParamFlags& outFlags, BfType*& outTypeConstraint);
BfTypeInstance* GetBaseType(BfTypeInstance* typeInst); BfTypeInstance* GetBaseType(BfTypeInstance* typeInst);

9
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -5494,7 +5494,7 @@ void BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
else if (resolvedFieldType->IsGenericParam()) else if (resolvedFieldType->IsGenericParam())
{ {
SetAndRestoreValue<BfFieldDef*> prevTypeRef(mContext->mCurTypeState->mCurFieldDef, fieldDef); SetAndRestoreValue<BfFieldDef*> prevTypeRef(mContext->mCurTypeState->mCurFieldDef, fieldDef);
auto genericParamInstance = GetGenericParamInstance((BfGenericParamType*)resolvedFieldType); auto genericParamInstance = GetGenericParamInstance((BfGenericParamType*)resolvedFieldType, false, BfFailHandleKind_Soft);
if (genericParamInstance != NULL) if (genericParamInstance != NULL)
{ {
if (((genericParamInstance->mGenericParamFlags & BfGenericParamFlag_Class) == 0) && if (((genericParamInstance->mGenericParamFlags & BfGenericParamFlag_Class) == 0) &&
@ -9461,7 +9461,7 @@ BfGenericParamInstance* BfModule::GetMergedGenericParamData(BfGenericParamType*
return genericParam; return genericParam;
} }
BfGenericParamInstance* BfModule::GetGenericParamInstance(BfGenericParamType* type, bool checkMixinBind) BfGenericParamInstance* BfModule::GetGenericParamInstance(BfGenericParamType* type, bool checkMixinBind, BfFailHandleKind failHandleKind)
{ {
if (type->mGenericParamKind == BfGenericParamKind_Method) if (type->mGenericParamKind == BfGenericParamKind_Method)
{ {
@ -9474,7 +9474,10 @@ BfGenericParamInstance* BfModule::GetGenericParamInstance(BfGenericParamType* ty
if ((curGenericMethodInstance == NULL) || (curGenericMethodInstance->mMethodInfoEx == NULL) || (type->mGenericParamIdx >= curGenericMethodInstance->mMethodInfoEx->mGenericParams.mSize)) if ((curGenericMethodInstance == NULL) || (curGenericMethodInstance->mMethodInfoEx == NULL) || (type->mGenericParamIdx >= curGenericMethodInstance->mMethodInfoEx->mGenericParams.mSize))
{ {
if (failHandleKind == Beefy::BfFailHandleKind_Normal)
FatalError("Invalid GetGenericParamInstance method generic param"); FatalError("Invalid GetGenericParamInstance method generic param");
else if (failHandleKind == Beefy::BfFailHandleKind_Soft)
InternalError("Invalid GetGenericParamInstance method generic param");
return NULL; return NULL;
} }
return curGenericMethodInstance->mMethodInfoEx->mGenericParams[type->mGenericParamIdx]; return curGenericMethodInstance->mMethodInfoEx->mGenericParams[type->mGenericParamIdx];
@ -15874,7 +15877,7 @@ void BfModule::DoTypeToString(StringImpl& str, BfType* resolvedType, BfTypeNameF
} }
} }
auto genericParamInstance = GetGenericParamInstance(genericParam); auto genericParamInstance = GetGenericParamInstance(genericParam, false, BfFailHandleKind_Soft);
if (genericParamInstance == NULL) if (genericParamInstance == NULL)
{ {
str += StrFormat("@M%d", genericParam->mGenericParamIdx); str += StrFormat("@M%d", genericParam->mGenericParamIdx);

7
IDEHelper/Compiler/BfSystem.h
View file

@ -166,6 +166,13 @@ struct BfAtomCompositeEquals
} }
}; };
enum BfFailHandleKind
{
BfFailHandleKind_Normal,
BfFailHandleKind_Soft,
BfFailHandleKind_Ignore
};
enum BfWhileSpecializingFlags : int8 enum BfWhileSpecializingFlags : int8
{ {
BfWhileSpecializingFlag_None = 0, BfWhileSpecializingFlag_None = 0,