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

Const resolve enum case cast fix

Browse source
This commit is contained in:
Brian Fiete 2025-01-23 07:29:50 -08:00
parent f830e23c52
commit 53f4e8955e
4 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
IDEHelper/Backend/BeIRCodeGen.cpp
View file

@ -1135,7 +1135,10 @@ void BeIRCodeGen::Read(BeMDNode*& llvmMD)
void BeIRCodeGen::HandleNextCmd() void BeIRCodeGen::HandleNextCmd()
{ {
if (mFailed) if (mFailed)
{
mStream->SetReadPos(mStream->GetSize());
return; return;
}
int curId = mCmdCount; int curId = mCmdCount;
@ -2318,7 +2321,11 @@ void BeIRCodeGen::HandleNextCmd()
CMD_PARAM(BeValue*, value); CMD_PARAM(BeValue*, value);
CMD_PARAM(BeBlock*, comingFrom); CMD_PARAM(BeBlock*, comingFrom);
BF_ASSERT(phiValue->GetType() == value->GetType()); if (phiValue->GetType() != value->GetType())
{
Fail("AddPhiIncoming type mismatch");
break;
}
auto phiIncoming = mBeModule->mAlloc.Alloc<BePhiIncoming>(); auto phiIncoming = mBeModule->mAlloc.Alloc<BePhiIncoming>();
phiIncoming->mBlock = comingFrom; phiIncoming->mBlock = comingFrom;

5
IDEHelper/Compiler/BfConstResolver.cpp
View file

@ -167,7 +167,10 @@ BfTypedValue BfConstResolver::Resolve(BfExpression* expr, BfType* wantType, BfCo
} }
else else
{ {
mResult = mModule->Cast(expr, mResult, wantType, (BfCastFlags)(BfCastFlags_WantsConst | (explicitCast ? BfCastFlags_Explicit : BfCastFlags_None))); BfCastFlags castFlags = (BfCastFlags)(BfCastFlags_WantsConst | (explicitCast ? BfCastFlags_Explicit : BfCastFlags_None));
if ((flags & BfConstResolveFlag_NoConversionOperator) != 0)
castFlags = (BfCastFlags)(castFlags | BfCastFlags_NoConversionOperator);
mResult = mModule->Cast(expr, mResult, wantType, castFlags);
} }
} }

1
IDEHelper/Compiler/BfConstResolver.h
View file

@ -19,6 +19,7 @@ enum BfConstResolveFlags
BfConstResolveFlag_NoActualizeValues = 0x10, BfConstResolveFlag_NoActualizeValues = 0x10,
BfConstResolveFlag_ArrayInitSize = 0x20, BfConstResolveFlag_ArrayInitSize = 0x20,
BfConstResolveFlag_AllowGlobalVariable = 0x40, BfConstResolveFlag_AllowGlobalVariable = 0x40,
BfConstResolveFlag_NoConversionOperator = 0x80
}; };
class BfConstResolver : public BfExprEvaluator class BfConstResolver : public BfExprEvaluator

4
IDEHelper/Compiler/BfModule.cpp
View file

@ -4679,6 +4679,10 @@ BfTypedValue BfModule::GetFieldInitializerValue(BfFieldInstance* fieldInstance,
// auto-created underlying type and it will cause an 'error flash'. We defer errors until the full resolve for that purpose // auto-created underlying type and it will cause an 'error flash'. We defer errors until the full resolve for that purpose
resolveFlags = BfConstResolveFlag_NoCast; resolveFlags = BfConstResolveFlag_NoCast;
} }
if ((mCurTypeInstance->IsEnum()) && (fieldDef->IsEnumCaseEntry()))
resolveFlags = (BfConstResolveFlags)(resolveFlags | BfConstResolveFlag_NoConversionOperator | BfConstResolveFlag_ExplicitCast);
UpdateSrcPos(initializer); UpdateSrcPos(initializer);
auto result = constResolver.Resolve(initializer, fieldType, resolveFlags); auto result = constResolver.Resolve(initializer, fieldType, resolveFlags);
if ((mCompiler->mCeMachine != NULL) && (fieldInstance != NULL)) if ((mCompiler->mCeMachine != NULL) && (fieldInstance != NULL))