commit 937b73eea7a473395f3572e0db1fdc9c6a094db5
author Brian Carlstrom <bdc@google.com> Wed Aug 01 16:09:16 2012 -0700
committer Brian Carlstrom <bdc@google.com> Wed Aug 01 16:09:16 2012 -0700
tree 73c6d5d2f44ac27b6750b5377b272dfd19618b02
parent 034f76b91225bea769d6185d7dad5e243af4ffa0

Revert "CFG rework for explicit exception edges"

This reverts commit 8b503db0432981c6b0b2271723f9bcf9448a554a.

Change-Id: I21d5255d827c63de6a229ef419f372fbcf4d16ed

src/compiler/codegen/MethodCodegenDriver.cc

diff --git a/src/compiler/codegen/MethodCodegenDriver.cc b/src/compiler/codegen/MethodCodegenDriver.cc
index d32c9fb..e56e627 100644
--- a/src/compiler/codegen/MethodCodegenDriver.cc
+++ b/src/compiler/codegen/MethodCodegenDriver.cc
@@ -819,10 +819,9 @@
   "kMirFusedCmpgDouble",
   "kMirFusedCmpLong",
   "kMirNop",
-  "kMirOpNullCheck",
-  "kMirOpRangeCheck",
-  "kMirOpDivZeroCheck",
-  "kMirOpCheck",
+  "kMirOpNullNRangeUpCheck",
+  "kMirOpNullNRangeDownCheck",
+  "kMirOpLowerBound",
 };
 
 /* Extended MIR instructions like PHI */
@@ -957,17 +956,7 @@
       newLIR1(cUnit, kPseudoSSARep, (int) ssaString);
     }
 
-    if ((int)dalvikOpcode == (int)kMirOpCheck) {
-      // Combine check and work halves of throwing instruction.
-      MIR* workHalf = mir->meta.throwInsn;
-      mir->dalvikInsn.opcode = workHalf->dalvikInsn.opcode;
-      SSARepresentation* ssaRep = workHalf->ssaRep;
-      workHalf->ssaRep = mir->ssaRep;
-      mir->ssaRep = ssaRep;
-      workHalf->dalvikInsn.opcode = static_cast<Instruction::Code>(kMirOpNop);
-    }
-
-    if ((int)dalvikOpcode >= (int)kMirOpFirst) {
+    if ((int)mir->dalvikInsn.opcode >= (int)kMirOpFirst) {
       handleExtendedMethodMIR(cUnit, bb, mir);
       continue;
     }