summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen
diff options
context:
space:
mode:
authorAndrew Trick <atrick@apple.com>2012-11-13 17:37:46 +0000
committerAndrew Trick <atrick@apple.com>2012-11-13 17:37:46 +0000
commit449c7ad7d7e5a64e1dd910391481ceebf0a8a58f (patch)
tree8e6ec8196e466e4903f07ebfe83a69cef39d8587 /llvm/lib/CodeGen
parenta05bb6bd7016c4e43d1dca4bcd969cb245d2ad43 (diff)
downloadbcm5719-llvm-449c7ad7d7e5a64e1dd910391481ceebf0a8a58f.tar.gz
bcm5719-llvm-449c7ad7d7e5a64e1dd910391481ceebf0a8a58f.zip
Fix -join-splitedges: my previous "cleanup" broke it.
Working on reducing unit tests. This won't be enabled unless a subtarget enables misched. llvm-svn: 167851
Diffstat (limited to 'llvm/lib/CodeGen')
-rw-r--r--llvm/lib/CodeGen/RegisterCoalescer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/RegisterCoalescer.cpp b/llvm/lib/CodeGen/RegisterCoalescer.cpp
index 8e6533c7479..5ec0aece1e5 100644
--- a/llvm/lib/CodeGen/RegisterCoalescer.cpp
+++ b/llvm/lib/CodeGen/RegisterCoalescer.cpp
@@ -253,7 +253,7 @@ static bool isSplitEdge(const MachineBasicBlock *MBB) {
for (MachineBasicBlock::const_iterator MII = MBB->begin(), E = MBB->end();
MII != E; ++MII) {
- if (!MII->isCopyLike() || !MII->isUnconditionalBranch())
+ if (!MII->isCopyLike() && !MII->isUnconditionalBranch())
return false;
}
return true;
OpenPOWER on IntegriCloud