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

Restrict const expression usage to generic arguments

Browse source
This commit is contained in:
Brian Fiete 2022-04-18 07:16:45 -07:00
parent 2b9443744b
commit 071dfa8e09
4 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
IDEHelper/Backend/BeIRCodeGen.cpp
View file

@ -1086,7 +1086,8 @@ void BeIRCodeGen::Read(BeMDNode*& llvmMD)
llvmMD = result.mBeMetadata; llvmMD = result.mBeMetadata;
BE_MEM_END("BeMDNode"); BE_MEM_END("BeMDNode");
llvmMD->mRefCount++; if (llvmMD != NULL)
llvmMD->mRefCount++;
} }
void BeIRCodeGen::HandleNextCmd() void BeIRCodeGen::HandleNextCmd()

2
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -10795,7 +10795,7 @@ BfType* BfModule::ResolveTypeRef(BfTypeReference* typeRef, BfPopulateType popula
lookupCtx.mResolveFlags = (BfResolveTypeRefFlags)(resolveFlags & lookupCtx.mResolveFlags = (BfResolveTypeRefFlags)(resolveFlags &
(BfResolveTypeRefFlag_NoCreate | BfResolveTypeRefFlag_IgnoreLookupError | BfResolveTypeRefFlag_DisallowComptime | (BfResolveTypeRefFlag_NoCreate | BfResolveTypeRefFlag_IgnoreLookupError | BfResolveTypeRefFlag_DisallowComptime |
BfResolveTypeRefFlag_AllowInferredSizedArray | BfResolveTypeRefFlag_Attribute | BfResolveTypeRefFlag_AllowUnboundGeneric | BfResolveTypeRefFlag_AllowInferredSizedArray | BfResolveTypeRefFlag_Attribute | BfResolveTypeRefFlag_AllowUnboundGeneric |
BfResolveTypeRefFlag_ForceUnboundGeneric)); BfResolveTypeRefFlag_ForceUnboundGeneric | BfResolveTypeRefFlag_AllowGenericParamConstValue));
lookupCtx.mRootTypeRef = typeRef; lookupCtx.mRootTypeRef = typeRef;
lookupCtx.mRootTypeDef = typeDef; lookupCtx.mRootTypeDef = typeDef;
lookupCtx.mModule = this; lookupCtx.mModule = this;

7
IDEHelper/Compiler/BfResolvedTypeUtils.cpp
View file

@ -3868,6 +3868,13 @@ int BfResolvedTypeSet::DoHash(BfTypeReference* typeRef, LookupContext* ctx, BfHa
} }
else if (auto constExprTypeRef = BfNodeDynCastExact<BfConstExprTypeRef>(typeRef)) else if (auto constExprTypeRef = BfNodeDynCastExact<BfConstExprTypeRef>(typeRef))
{ {
if ((flags & BfHashFlag_AllowGenericParamConstValue) == 0)
{
ctx->mModule->Fail("Invalid use of const expression", constExprTypeRef->mConstToken);
ctx->mFailed = true;
return 0;
}
BfVariant result; BfVariant result;
BfType* resultType = NULL; BfType* resultType = NULL;
if (constExprTypeRef->mConstExpr != NULL) if (constExprTypeRef->mConstExpr != NULL)

10
IDEHelper/Compiler/BfResolvedTypeUtils.h
View file

@ -2658,7 +2658,15 @@ public:
int tryCount = 0; int tryCount = 0;
ctx->mFailed = false; ctx->mFailed = false;
int hashVal = Hash(findType, ctx, BfHashFlag_AllowRef);
BfHashFlags hashFlags = BfHashFlag_AllowRef;
if ((ctx->mResolveFlags & BfResolveTypeRefFlag_AllowGenericParamConstValue) != 0)
{
ctx->mResolveFlags = (BfResolveTypeRefFlags)(ctx->mResolveFlags & ~BfResolveTypeRefFlag_AllowGenericParamConstValue);
hashFlags = (BfHashFlags)(hashFlags | BfHashFlag_AllowGenericParamConstValue);
}
int hashVal = Hash(findType, ctx, hashFlags);
if ((ctx->mFailed) || (ctx->mHadVar)) if ((ctx->mFailed) || (ctx->mHadVar))
{ {
return false; return false;