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

CheckGenericCtor fixes

Browse source
This commit is contained in:
Brian Fiete 2025-01-29 10:09:52 -08:00
parent 1a1f6f793b
commit da3c5c3c57
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -9453,6 +9453,10 @@ bool BfExprEvaluator::CheckGenericCtor(BfGenericParamType* genericParamType, BfR
mModule->Fail(StrFormat("Must add 'where %s : struct' constraint to generic parameter to instantiate type without allocator", genericParam->GetGenericParamDef()->mName.c_str()), targetSrc); mModule->Fail(StrFormat("Must add 'where %s : struct' constraint to generic parameter to instantiate type without allocator", genericParam->GetGenericParamDef()->mName.c_str()), targetSrc);
success = false; success = false;
} }
else if ((mBfEvalExprFlags & BfEvalExprFlags_Comptime) != 0)
{
mModule->Fail(StrFormat("Generic parameter '%s' constructor cannot be guaranteed to be const-evaluable", genericParam->GetGenericParamDef()->mName.c_str()), targetSrc);
}
return success; return success;
} }
@ -18614,7 +18618,8 @@ void BfExprEvaluator::DoInvocation(BfAstNode* target, BfMethodBoundExpression* m
BfResolveArgsFlags resolveArgsFlags = BfResolveArgsFlag_None; BfResolveArgsFlags resolveArgsFlags = BfResolveArgsFlag_None;
ResolveArgValues(argValues, resolveArgsFlags); ResolveArgValues(argValues, resolveArgsFlags);
CheckGenericCtor((BfGenericParamType*)expectingType, argValues, invocationExpr->mTarget); if (!mModule->mCurMethodInstance->mIsUnspecializedVariation)
CheckGenericCtor((BfGenericParamType*)expectingType, argValues, invocationExpr->mTarget);
mResult = mModule->GetDefaultTypedValue(expectingType); mResult = mModule->GetDefaultTypedValue(expectingType);
return; return;
} }

7
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -9558,6 +9558,13 @@ BfGenericParamInstance* BfModule::GetGenericTypeParamInstance(int genericParamId
// curTypeInstance = mCurMethodInstance->mMethodInstanceGroup->mOwner; // curTypeInstance = mCurMethodInstance->mMethodInstanceGroup->mOwner;
BfTypeInstance* genericTypeInst = curTypeInstance->ToGenericTypeInstance(); BfTypeInstance* genericTypeInst = curTypeInstance->ToGenericTypeInstance();
if (genericTypeInst == NULL)
{
FatalError("Invalid mCurTypeInstance for GetGenericTypeParamInstance");
return NULL;
}
if ((genericTypeInst->IsIncomplete()) && (genericTypeInst->mGenericTypeInfo->mGenericParams.size() == 0)) if ((genericTypeInst->IsIncomplete()) && (genericTypeInst->mGenericTypeInfo->mGenericParams.size() == 0))
{ {
// Set this to NULL so we don't recurse infinitely // Set this to NULL so we don't recurse infinitely