summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen
diff options
context:
space:
mode:
authorJakob Stoklund Olesen <stoklund@2pi.dk>2013-01-24 23:59:08 +0000
committerJakob Stoklund Olesen <stoklund@2pi.dk>2013-01-24 23:59:08 +0000
commite0ef47436c4dc608eef011ec81a4caa337b16b8d (patch)
tree3d942c058b8cd1504485e66c8a2ac17f4090db90 /llvm/lib/CodeGen
parentbe230793fb681e070ac87edbc742651c551f64de (diff)
downloadbcm5719-llvm-e0ef47436c4dc608eef011ec81a4caa337b16b8d.tar.gz
bcm5719-llvm-e0ef47436c4dc608eef011ec81a4caa337b16b8d.zip
Avoid creating duplicate CFG edges in the IfConversion pass.
Patch by Stefan Hepp. llvm-svn: 173395
Diffstat (limited to 'llvm/lib/CodeGen')
-rw-r--r--llvm/lib/CodeGen/IfConversion.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/IfConversion.cpp b/llvm/lib/CodeGen/IfConversion.cpp
index 3583a9b71b3..9958d7daada 100644
--- a/llvm/lib/CodeGen/IfConversion.cpp
+++ b/llvm/lib/CodeGen/IfConversion.cpp
@@ -1557,7 +1557,7 @@ void IfConverter::MergeBlocks(BBInfo &ToBBI, BBInfo &FromBBI, bool AddEdges) {
if (Succ == FallThrough)
continue;
FromBBI.BB->removeSuccessor(Succ);
- if (AddEdges)
+ if (AddEdges && !ToBBI.BB->isSuccessor(Succ))
ToBBI.BB->addSuccessor(Succ);
}
OpenPOWER on IntegriCloud