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

Better handling of undef const expressions

Browse source
This commit is contained in:
Brian Fiete 2022-04-18 07:57:15 -07:00
parent 071dfa8e09
commit 1a93660416
4 changed files with 42 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -6903,7 +6903,19 @@ BfConstExprValueType* BfModule::CreateConstExprValueType(const BfTypedValue& typ
BfResolveTypeRefFlags resolveFlags = allowCreate ? BfResolveTypeRefFlag_None : BfResolveTypeRefFlag_NoCreate;
auto variant = TypedValueToVariant(NULL, typedValue);
if (variant.mTypeCode == BfTypeCode_None)
{
if (auto constant = mBfIRBuilder->GetConstant(typedValue.mValue))
{
if (constant->mConstType == BfConstType_Undef)
{
variant.mTypeCode = BfTypeCode_Let;
}
}
}
if (variant.mTypeCode == BfTypeCode_None)
return NULL;
auto constExprValueType = mContext->mConstExprValueTypePool.Get();
@ -12895,7 +12907,7 @@ BfIRValue BfModule::CastToValue(BfAstNode* srcNode, BfTypedValue typedVal, BfTyp
{
BfConstExprValueType* toConstExprValueType = (BfConstExprValueType*)toType;
auto variantVal = TypedValueToVariant(srcNode, typedVal);
auto variantVal = TypedValueToVariant(srcNode, typedVal, true);
if ((mBfIRBuilder->IsIntable(variantVal.mTypeCode)) && (mBfIRBuilder->IsIntable(toConstExprValueType->mValue.mTypeCode)))
{
if (variantVal.mInt64 == toConstExprValueType->mValue.mInt64)
@ -12914,6 +12926,11 @@ BfIRValue BfModule::CastToValue(BfAstNode* srcNode, BfTypedValue typedVal, BfTyp
return typedVal.mValue;
}
if ((toConstExprValueType->mValue.mTypeCode == BfTypeCode_Let) && (constant->mConstType == BfConstType_Undef))
{
return typedVal.mValue;
}
if (!ignoreErrors)
{
String valStr;