commit ed3e930109e3f01804ca32cee4afe4f2d4b3f4d8
author buzbee <buzbee@google.com> Fri Sep 23 17:34:19 2011 -0700
committer buzbee <buzbee@google.com> Fri Sep 23 18:34:31 2011 -0700
tree 41c3ffd3fdade2244b4cd3824c98419edecbca86
parent 8060925c45cc2607ab92390d7366c6c0cfdfe4bb

assert to DCHECK conversion

Also replaced static function defs with a STATIC macro to make normally
hidden functions visible to DCHECK's traceback listing).  Additionally,
added some portions of the new type & size inference mechanism (but not
taking advantage of them yet).

Change-Id: Ib42a08777f28ab879d0df37617e1b77e3f09ba52

src/compiler/Dataflow.cc

diff --git a/src/compiler/Dataflow.cc b/src/compiler/Dataflow.cc
index d4b5339..97a5e7b 100644
--- a/src/compiler/Dataflow.cc
+++ b/src/compiler/Dataflow.cc
@@ -1852,7 +1852,7 @@
 }
 
 /* Any register that is used before being defined is considered live-in */
-static inline void handleLiveInUse(ArenaBitVector* useV, ArenaBitVector* defV,
+STATIC inline void handleLiveInUse(ArenaBitVector* useV, ArenaBitVector* defV,
                                    ArenaBitVector* liveInV, int dalvikRegId)
 {
     oatSetBit(useV, dalvikRegId);
@@ -1862,7 +1862,7 @@
 }
 
 /* Mark a reg as being defined */
-static inline void handleDef(ArenaBitVector* defV, int dalvikRegId)
+STATIC inline void handleDef(ArenaBitVector* defV, int dalvikRegId)
 {
     oatSetBit(defV, dalvikRegId);
 }
@@ -1921,7 +1921,7 @@
 }
 
 /* Find out the latest SSA register for a given Dalvik register */
-static void handleSSAUse(CompilationUnit* cUnit, int* uses, int dalvikReg,
+STATIC void handleSSAUse(CompilationUnit* cUnit, int* uses, int dalvikReg,
                          int regIndex)
 {
     int encodedValue = cUnit->dalvikToSSAMap[dalvikReg];
@@ -1930,7 +1930,7 @@
 }
 
 /* Setup a new SSA register for a given Dalvik register */
-static void handleSSADef(CompilationUnit* cUnit, int* defs, int dalvikReg,
+STATIC void handleSSADef(CompilationUnit* cUnit, int* defs, int dalvikReg,
                          int regIndex)
 {
     int ssaReg = cUnit->numSSARegs++;
@@ -1947,7 +1947,7 @@
 }
 
 /* Look up new SSA names for format_35c instructions */
-static void dataFlowSSAFormat35C(CompilationUnit* cUnit, MIR* mir)
+STATIC void dataFlowSSAFormat35C(CompilationUnit* cUnit, MIR* mir)
 {
     DecodedInstruction *dInsn = &mir->dalvikInsn;
     int numUses = dInsn->vA;
@@ -1955,6 +1955,8 @@
 
     mir->ssaRep->numUses = numUses;
     mir->ssaRep->uses = (int *)oatNew(sizeof(int) * numUses, false);
+    // NOTE: will be filled in during type & size inference pass
+    mir->ssaRep->fpUse = (bool *)oatNew(sizeof(bool) * numUses, false);
 
     for (i = 0; i < numUses; i++) {
         handleSSAUse(cUnit, mir->ssaRep->uses, dInsn->arg[i], i);
@@ -1962,7 +1964,7 @@
 }
 
 /* Look up new SSA names for format_3rc instructions */
-static void dataFlowSSAFormat3RC(CompilationUnit* cUnit, MIR* mir)
+STATIC void dataFlowSSAFormat3RC(CompilationUnit* cUnit, MIR* mir)
 {
     DecodedInstruction *dInsn = &mir->dalvikInsn;
     int numUses = dInsn->vA;
@@ -1970,6 +1972,8 @@
 
     mir->ssaRep->numUses = numUses;
     mir->ssaRep->uses = (int *)oatNew(sizeof(int) * numUses, false);
+    // NOTE: will be filled in during type & size inference pass
+    mir->ssaRep->fpUse = (bool *)oatNew(sizeof(bool) * numUses, false);
 
     for (i = 0; i < numUses; i++) {
         handleSSAUse(cUnit, mir->ssaRep->uses, dInsn->vC+i, i);
@@ -2119,7 +2123,7 @@
 }
 
 /* Setup a constant value for opcodes thare have the DF_SETS_CONST attribute */
-static void setConstant(CompilationUnit* cUnit, int ssaReg, int value)
+STATIC void setConstant(CompilationUnit* cUnit, int ssaReg, int value)
 {
     oatSetBit(cUnit->isConstantV, ssaReg);
     cUnit->constantValues[ssaReg] = value;
@@ -2360,7 +2364,7 @@
     }
 }
 
-static bool nullCheckEliminationInit(struct CompilationUnit* cUnit,
+STATIC bool nullCheckEliminationInit(struct CompilationUnit* cUnit,
                                      struct BasicBlock* bb)
 {
     if (bb->dataFlowInfo == NULL) return false;
@@ -2371,7 +2375,7 @@
 }
 
 /* Eliminate unnecessary null checks for a basic block. */
-static bool eliminateNullChecks( struct CompilationUnit* cUnit,
+STATIC bool eliminateNullChecks( struct CompilationUnit* cUnit,
                                  struct BasicBlock* bb)
 {
     if (bb->dataFlowInfo == NULL) return false;
@@ -2395,7 +2399,7 @@
         ArenaBitVectorIterator bvIterator;
         oatBitVectorIteratorInit(bb->predecessors, &bvIterator);
         int predBBIdx = oatBitVectorIteratorNext(&bvIterator);
-        DCHECK(predBBIdx != -1);
+        DCHECK_NE(predBBIdx, -1);
         BasicBlock* predBB = (BasicBlock*)oatGrowableListGetElement(
             blockList, predBBIdx);
         oatCopyBitVector(cUnit->tempSSARegisterV,