[llvm-commits] [llvm] r167851 - /llvm/trunk/lib/CodeGen/RegisterCoalescer.cpp

[Andrew Trick]

Author: atrick
Date: Tue Nov 13 11:37:46 2012
New Revision: 167851

URL: http://llvm.org/viewvc/llvm-project?rev=167851&view=rev
Log:
Fix -join-splitedges: my previous "cleanup" broke it.

Working on reducing unit tests.
This won't be enabled unless a subtarget enables misched.

Modified:
    llvm/trunk/lib/CodeGen/RegisterCoalescer.cpp

Modified: llvm/trunk/lib/CodeGen/RegisterCoalescer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegisterCoalescer.cpp?rev=167851&r1=167850&r2=167851&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/RegisterCoalescer.cpp (original)
+++ llvm/trunk/lib/CodeGen/RegisterCoalescer.cpp Tue Nov 13 11:37:46 2012
@@ -253,7 +253,7 @@
 
   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;