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

Fixed switch with constant value and fallthroughs

Browse source
This commit is contained in:
Brian Fiete 2020-11-04 09:23:34 -08:00
parent e1119d77a9
commit d4d74ed37c
2 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
IDEHelper/Backend/BeMCContext.cpp
View file

@ -3744,7 +3744,7 @@ BeMCOperand BeMCContext::AllocVirtualReg(BeType* type, int refCount, bool mustBe
if (mDebugging) if (mDebugging)
{ {
if (mcOperand.mVRegIdx == 14) if (mcOperand.mVRegIdx == 6)
{ {
NOP; NOP;
} }
@ -8610,6 +8610,17 @@ void BeMCContext::DoActualization()
BF_ASSERT((!vregInfo->IsDirectRelTo()) || (vregInfo->mDbgVariable != NULL)); BF_ASSERT((!vregInfo->IsDirectRelTo()) || (vregInfo->mDbgVariable != NULL));
if (vregInfo->mIsExpr) if (vregInfo->mIsExpr)
{
if (vregInfo->IsDirectRelToAny())
{
AllocInst(BeMCInstKind_Mov, BeMCOperand::FromVReg(vregIdx), vregInfo->mRelTo, instIdx++ + 1);
vregInfo->mIsExpr = false;
vregInfo->mRelTo = BeMCOperand();
vregInfo->mRelOffset = BeMCOperand();
vregInfo->mRelOffsetScale = 1;
}
else
{ {
// Create a new reg with the expression, and then load the value into the old non-expressionized reg // Create a new reg with the expression, and then load the value into the old non-expressionized reg
// This has the advantage of fixing any other references to this expr, too // This has the advantage of fixing any other references to this expr, too
@ -8633,6 +8644,7 @@ void BeMCContext::DoActualization()
} }
} }
} }
}
if (!hasMoreWork) if (!hasMoreWork)
break; break;

6
IDEHelper/Compiler/BfStmtEvaluator.cpp
View file

@ -4311,6 +4311,8 @@ void BfModule::Visit(BfSwitchStatement* switchStmt)
auto startingLocalVarId = mCurMethodState->GetRootMethodState()->mCurLocalVarId; auto startingLocalVarId = mCurMethodState->GetRootMethodState()->mCurLocalVarId;
bool prevHadFallthrough = false;
Dictionary<int64, _CaseState> handledCases; Dictionary<int64, _CaseState> handledCases;
for (BfSwitchCase* switchCase : switchStmt->mSwitchCases) for (BfSwitchCase* switchCase : switchStmt->mSwitchCases)
{ {
@ -4596,7 +4598,7 @@ void BfModule::Visit(BfSwitchStatement* switchStmt)
auto prevInsertBlock = mBfIRBuilder->GetInsertBlock(); auto prevInsertBlock = mBfIRBuilder->GetInsertBlock();
SetAndRestoreValue<bool> prevIgnoreWrites(mBfIRBuilder->mIgnoreWrites, true, !mayHaveMatch); SetAndRestoreValue<bool> prevIgnoreWrites(mBfIRBuilder->mIgnoreWrites, true, !mayHaveMatch && !prevHadFallthrough);
mBfIRBuilder->AddBlock(caseBlock); mBfIRBuilder->AddBlock(caseBlock);
mBfIRBuilder->SetInsertPoint(caseBlock); mBfIRBuilder->SetInsertPoint(caseBlock);
@ -4678,6 +4680,8 @@ void BfModule::Visit(BfSwitchStatement* switchStmt)
mBfIRBuilder->SetInsertPoint(prevInsertBlock); mBfIRBuilder->SetInsertPoint(prevInsertBlock);
prevHadFallthrough = mCurMethodState->mDeferredLocalAssignData->mHadFallthrough;
blockIdx++; blockIdx++;
} }