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

Fixed for discriminated unions with attempted initializers

Browse source
This commit is contained in:
Brian Fiete 2020-09-22 08:34:16 -07:00
parent fd3265445d
commit 2192305800
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
IDEHelper/Compiler/BfModule.cpp
View file

@ -3659,8 +3659,8 @@ void BfModule::ResolveConstField(BfTypeInstance* typeInstance, BfFieldInstance*
Fail("Const requires initializer", fieldDef->mFieldDeclaration->mNameNode); Fail("Const requires initializer", fieldDef->mFieldDeclaration->mNameNode);
} }
} }
else else if (mBfIRBuilder != NULL)
{ {
SetAndRestoreValue<BfTypeInstance*> prevTypeInstance(mCurTypeInstance, typeInstance); SetAndRestoreValue<BfTypeInstance*> prevTypeInstance(mCurTypeInstance, typeInstance);
SetAndRestoreValue<bool> prevIgnoreWrite(mBfIRBuilder->mIgnoreWrites, true); SetAndRestoreValue<bool> prevIgnoreWrite(mBfIRBuilder->mIgnoreWrites, true);
@ -3692,6 +3692,12 @@ void BfModule::ResolveConstField(BfTypeInstance* typeInstance, BfFieldInstance*
constValue = uncastedInitValue.mValue; constValue = uncastedInitValue.mValue;
} }
if ((mCurTypeInstance->IsPayloadEnum()) && (fieldDef->IsEnumCaseEntry()))
{
// Illegal
constValue = BfIRValue();
}
mBfIRBuilder->SetInsertPoint(prevInsertBlock); mBfIRBuilder->SetInsertPoint(prevInsertBlock);
} }