aboutsummaryrefslogtreecommitdiff
path: root/lib
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
commit2344abc939b29ab80bbd247995a0ceb2efa5938b (patch)
tree63419eb2fa91c6c8ed04567f10daf451c09bfd3c /lib
parentfc298c76c7e5f569ab4310b237784609458c2ea8 (diff)
Fix -join-splitedges: my previous "cleanup" broke it.
Working on reducing unit tests. This won't be enabled unless a subtarget enables misched. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167851 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/CodeGen/RegisterCoalescer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/CodeGen/RegisterCoalescer.cpp b/lib/CodeGen/RegisterCoalescer.cpp
index 8e6533c747..5ec0aece1e 100644
--- a/lib/CodeGen/RegisterCoalescer.cpp
+++ b/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;