Enable the rest of branch fusing

I mistakenly left most of the branch fusing cases disabled in
the previous CL.  This CL turns them all on, along with a fix
for the bug I was chasing while disabling them in the first
place.

Change-Id: Ia60f7fe5394a5da08ed75bbff39b47ae9497a61c

1 files changed, 5 insertions, 5 deletions

diff --git a/src/compiler/Dataflow.cc b/src/compiler/Dataflow.cc
index 5f632c061d..bea5ef07d9 100644
--- a/src/compiler/Dataflow.cc
+++ b/src/compiler/Dataflow.cc
@@ -1869,19 +1869,19 @@ bool basicBlockOpt(CompilationUnit* cUnit, BasicBlock* bb)
                             ccode = kCondEq;
                             break;
                         case Instruction::IF_NEZ:
-                           // ccode = kCondNe;
+                            ccode = kCondNe;
                             break;
                         case Instruction::IF_LTZ:
-                            // ccode = kCondLt;
+                            ccode = kCondLt;
                             break;
                         case Instruction::IF_GEZ:
-                            // ccode = kCondGe;
+                            ccode = kCondGe;
                             break;
                         case Instruction::IF_GTZ:
-                            // ccode = kCondGt;
+                            ccode = kCondGt;
                             break;
                         case Instruction::IF_LEZ:
-                            // ccode = kCondLe;
+                            ccode = kCondLe;
                             break;
                         default:
                             break;