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
diff --git a/src/compiler/codegen/MethodCodegenDriver.cc b/src/compiler/codegen/MethodCodegenDriver.cc
index 1dc11da..fb9bdc9 100644
--- a/src/compiler/codegen/MethodCodegenDriver.cc
+++ b/src/compiler/codegen/MethodCodegenDriver.cc
@@ -737,9 +737,6 @@
const char* extendedMIROpNames[kMirOpLast - kMirOpFirst] = {
"kMirOpPhi",
- "kMirOpNullNRangeUpCheck",
- "kMirOpNullNRangeDownCheck",
- "kMirOpLowerBound",
"kMirOpCopy",
"kMirFusedCmplFloat",
"kMirFusedCmpgFloat",
@@ -747,6 +744,9 @@
"kMirFusedCmpgDouble",
"kMirFusedCmpLong",
"kMirNop",
+ "kMirOpNullNRangeUpCheck",
+ "kMirOpNullNRangeDownCheck",
+ "kMirOpLowerBound",
};
/* Extended MIR instructions like PHI */