summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
diff options
context:
space:
mode:
authorMatthias Braun <matze@braunis.de>2015-08-26 20:46:49 +0000
committerMatthias Braun <matze@braunis.de>2015-08-26 20:46:49 +0000
commit4816b18d863f351542fa5564ac4d0068985d7bff (patch)
tree53e0639a458a77176263a15ccdbd54da3b596734 /llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
parentaf083d4cf9827d363647ac5214e27dc591a4ee35 (diff)
downloadbcm5719-llvm-4816b18d863f351542fa5564ac4d0068985d7bff.tar.gz
bcm5719-llvm-4816b18d863f351542fa5564ac4d0068985d7bff.zip
FastISel: Avoid adding a successor block twice for degenerate IR.
This fixes http://llvm.org/PR24581 Differential Revision: http://reviews.llvm.org/D12350 llvm-svn: 246074
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/FastISel.cpp')
-rw-r--r--llvm/lib/CodeGen/SelectionDAG/FastISel.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
index d5011d2d62d..13b097cfc60 100644
--- a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
@@ -1415,7 +1415,11 @@ void FastISel::finishCondBranch(const BasicBlock *BranchBB,
if (FuncInfo.BPI)
BranchWeight = FuncInfo.BPI->getEdgeWeight(BranchBB,
TrueMBB->getBasicBlock());
- FuncInfo.MBB->addSuccessor(TrueMBB, BranchWeight);
+ // Add TrueMBB as successor unless it is equal to the FalseMBB: This can
+ // happen in degenerate IR and MachineIR forbids to have a block twice in the
+ // successor/predecessor lists.
+ if (TrueMBB != FalseMBB)
+ FuncInfo.MBB->addSuccessor(TrueMBB, BranchWeight);
fastEmitBranch(FalseMBB, DbgLoc);
}
OpenPOWER on IntegriCloud