6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-22 10:29:35 +00:00
Code Issues Projects Releases Wiki Activity

[SwitchLowering] Fix the "fixPhis" function.

Browse Source 
Switch statements may have more than one incoming edge into the same BB if they
all have the same value. When the switch statement is converted these incoming
edges are now coming from multiple BBs. Updating all incoming values to be from
a single BB is incorrect and would generate invalid LLVM IR.

The fix is to only update the first occurrence of an incoming value. Switch
lowering will perform subsequent calls to this helper function for each incoming
edge with a new basic block - updating all edges in the process.

This fixes rdar://problem/18916275.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221627 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Juergen Ributzka 2014-11-10 21:05:27 +00:00
parent 1a66dc7468
commit d0995fb982
2 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Transforms/Utils/LowerSwitch.cpp
View File

@ -131,17 +131,24 @@ static raw_ostream& operator<<(raw_ostream &O,
return O << "]";
}
static void fixPhis(BasicBlock *Succ,
BasicBlock *OrigBlock,
BasicBlock *NewNode) {
for (BasicBlock::iterator I = Succ->begin(),
E = Succ->getFirstNonPHI();
/// \brief Update the first occurrence of the "switch statement" BB in the PHI
/// node with the "new" BB. The other occurrences will be updated by subsequent
/// calls to this function.
///
/// Switch statements may have more than one incoming edge into the same BB if
/// they all have the same value. When the switch statement is converted these
/// incoming edges are now coming from multiple BBs.
static void fixPhis(BasicBlock *SuccBB, BasicBlock *OrigBB, BasicBlock *NewBB) {
for (BasicBlock::iterator I = SuccBB->begin(), E = SuccBB->getFirstNonPHI();
I != E; ++I) {
PHINode *PN = cast<PHINode>(I);
for (unsigned I = 0, E = PN->getNumIncomingValues(); I != E; ++I) {
if (PN->getIncomingBlock(I) == OrigBlock)
PN->setIncomingBlock(I, NewNode);
// Only update the first occurence.
for (unsigned Idx = 0, E = PN->getNumIncomingValues(); Idx != E; ++Idx) {
if (PN->getIncomingBlock(Idx) == OrigBB) {
PN->setIncomingBlock(Idx, NewBB);
break;
}
}
}
}

22
test/Transforms/Util/lowerswitch.ll Normal file
View File

@ -0,0 +1,22 @@
; RUN: opt -lowerswitch -S < %s | FileCheck %s
; Test that we don't crash and have a different basic block for each incoming edge.
define void @test_lower_switch() {
; CHECK-LABEL: @test_lower_switch
; CHECK: %merge = phi i64 [ 1, %BB3 ], [ 0, %NewDefault ], [ 0, %NodeBlock5 ], [ 0, %LeafBlock1 ]
BB1:
switch i32 undef, label %BB2 [
i32 3, label %BB2
i32 5, label %BB2
i32 0, label %BB3
i32 2, label %BB3
i32 4, label %BB3
]
BB2:
%merge = phi i64 [ 1, %BB3 ], [ 0, %BB1 ], [ 0, %BB1 ], [ 0, %BB1 ]
ret void
BB3:
br label %BB2
}