commit a3760aad59f41bb0b1d46733165a2d7219ecca73
author Ian Rogers <irogers@google.com> Mon Nov 14 14:32:37 2011 -0800
committer Ian Rogers <irogers@google.com> Mon Nov 14 15:40:11 2011 -0800
tree 28c031bac11cc172f04b8943e189bf1d065acd9c
parent 169c9a7f46776b235d0a37d5e0ff27682deffe06

Refactor the use of Method by the oat compiler.

Change-Id: Ib0ee18ed06846f82567f746edc7a5049dc6215df

src/compiler/Dataflow.cc

diff --git a/src/compiler/Dataflow.cc b/src/compiler/Dataflow.cc
index 0eff7ea..8b92c86 100644
--- a/src/compiler/Dataflow.cc
+++ b/src/compiler/Dataflow.cc
@@ -2110,11 +2110,10 @@
      * blocks.
      */
     bb->dataFlowInfo->dalvikToSSAMap =
-        (int *)oatNew(sizeof(int) * cUnit->method->NumRegisters(),
-                              false);
+        (int *)oatNew(sizeof(int) * cUnit->numDalvikRegisters, false);
 
     memcpy(bb->dataFlowInfo->dalvikToSSAMap, cUnit->dalvikToSSAMap,
-           sizeof(int) * cUnit->method->NumRegisters());
+           sizeof(int) * cUnit->numDalvikRegisters);
     return true;
 }
 
@@ -2202,7 +2201,7 @@
 void oatInitializeSSAConversion(CompilationUnit* cUnit)
 {
     int i;
-    int numDalvikReg = cUnit->method->NumRegisters();
+    int numDalvikReg = cUnit->numDalvikRegisters;
 
     cUnit->ssaToDalvikMap = (GrowableList *)oatNew(sizeof(GrowableList),
                                                            false);
@@ -2383,10 +2382,9 @@
 
     if ((bb->blockType == kEntryBlock) | bb->catchEntry) {
         oatClearAllBits(cUnit->tempSSARegisterV);
-        if (!cUnit->method->IsStatic()) {
+        if ((cUnit->access_flags & art::kAccStatic) == 0) {
             // If non-static method, mark "this" as non-null
-            int thisReg = cUnit->method->NumRegisters() -
-                          cUnit->method->NumIns();
+            int thisReg = cUnit->numDalvikRegisters - cUnit->numIns;
             oatSetBit(cUnit->tempSSARegisterV, thisReg);
         }
     } else {