commit 81bc509784e1bf20f9d92ce01ab9702123e2ef92
author Elliott Hughes <enh@google.com> Fri Sep 30 17:25:59 2011 -0700
committer Elliott Hughes <enh@google.com> Fri Sep 30 17:33:16 2011 -0700
tree 727f94397f0b09714a7ecc38c093267067054364
parent 14134a10e9bbaff0faf314dc00c1a1aeef8ef86b

Silence a misleading compiler warning.

Now we use this code for wide volatiles, it can't always complain about
the field being unresolved.

Change-Id: Ieb0663d654f8af99890d4925cd8897f5c95c6001

src/compiler/codegen/arm/MethodCodegenDriver.cc

diff --git a/src/compiler/codegen/arm/MethodCodegenDriver.cc b/src/compiler/codegen/arm/MethodCodegenDriver.cc
index 9e026be..80118d8 100644
--- a/src/compiler/codegen/arm/MethodCodegenDriver.cc
+++ b/src/compiler/codegen/arm/MethodCodegenDriver.cc
@@ -187,8 +187,7 @@
     oatFlushAllRegs(cUnit);
     if (SLOW_FIELD_PATH || field == NULL) {
         // Slow path
-        LOG(INFO) << "Field " << fieldNameFromIndex(cUnit->method, fieldIdx)
-            << " unresolved at compile time";
+        warnIfUnresolved(cUnit, fieldIdx, field);
         int funcOffset = isObject ? OFFSETOF_MEMBER(Thread, pSetObjStatic)
                                   : OFFSETOF_MEMBER(Thread, pSet32Static);
         loadWordDisp(cUnit, rSELF, funcOffset, rLR);
@@ -252,8 +251,7 @@
     bool isVolatile = false;
 #endif
     if (SLOW_FIELD_PATH || field == NULL || isVolatile) {
-        LOG(INFO) << "Field " << fieldNameFromIndex(cUnit->method, fieldIdx)
-            << " unresolved at compile time";
+        warnIfUnresolved(cUnit, fieldIdx, field);
         loadWordDisp(cUnit, rSELF, OFFSETOF_MEMBER(Thread, pSet64Static), rLR);
         loadConstant(cUnit, r0, mir->dalvikInsn.vB);
         loadCurrMethodDirect(cUnit, r1);
@@ -304,8 +302,7 @@
 #endif
     oatFlushAllRegs(cUnit);
     if (SLOW_FIELD_PATH || field == NULL || isVolatile) {
-        LOG(INFO) << "Field " << fieldNameFromIndex(cUnit->method, fieldIdx)
-            << " unresolved at compile time";
+        warnIfUnresolved(cUnit, fieldIdx, field);
         loadWordDisp(cUnit, rSELF, OFFSETOF_MEMBER(Thread, pGet64Static), rLR);
         loadConstant(cUnit, r0, mir->dalvikInsn.vB);
         loadCurrMethodDirect(cUnit, r1);
@@ -354,9 +351,8 @@
                      (mir->dalvikInsn.opcode == OP_SGET_OBJECT_VOLATILE));
     oatFlushAllRegs(cUnit);
     if (SLOW_FIELD_PATH || field == NULL) {
-        LOG(INFO) << "Field " << fieldNameFromIndex(cUnit->method, fieldIdx)
-            << " unresolved at compile time";
         // Slow path
+        warnIfUnresolved(cUnit, fieldIdx, field);
         int funcOffset = isObject ? OFFSETOF_MEMBER(Thread, pGetObjStatic)
                                   : OFFSETOF_MEMBER(Thread, pGet32Static);
         loadWordDisp(cUnit, rSELF, funcOffset, rLR);