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

Fix for sized array initializer with global variables

Browse source
This commit is contained in:
Brian Fiete 2020-05-18 09:59:59 -07:00
parent cd09529c9a
commit 3509d659ea
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
IDEHelper/Backend/BeIRCodeGen.cpp
View file

@ -720,7 +720,14 @@ void BeIRCodeGen::Read(BeValue*& beValue)
auto constStruct = mBeModule->mOwnedValues.Alloc<BeStructConstant>(); auto constStruct = mBeModule->mOwnedValues.Alloc<BeStructConstant>();
constStruct->mType = type; constStruct->mType = type;
for (auto val : values) for (auto val : values)
constStruct->mMemberValues.push_back(BeValueDynCast<BeConstant>(val)); {
BeConstant* constant = BeValueDynCast<BeConstant>(val);
constStruct->mMemberValues.push_back(constant);
#ifdef _DEBUG
auto memberType = constant->GetType();
BF_ASSERT(memberType == arrayType->mElementType);
#endif
}
beValue = constStruct; beValue = constStruct;
BE_MEM_END("ParamType_Const_Array"); BE_MEM_END("ParamType_Const_Array");
return; return;

3
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -15590,9 +15590,10 @@ void BfExprEvaluator::InitializedSizedArray(BfSizedArrayType* arrayType, BfToken
// For now, we can't properly create const-valued non-size-aligned composites // For now, we can't properly create const-valued non-size-aligned composites
if (checkArrayType->mElementType->NeedsExplicitAlignment()) if (checkArrayType->mElementType->NeedsExplicitAlignment())
isAllConst = false; isAllConst = false;
if (!elementValue.mValue.IsConst()) if (!elementValue.mValue.IsConst())
isAllConst = false; isAllConst = false;
if (elementValue.IsAddr())
isAllConst = false;
InitValue initValue; InitValue initValue;
initValue.mValue = elementValue; initValue.mValue = elementValue;