From: Ben Cheng <bccheng@google.com>
Date: Wed, 14 Oct 2009 06:09:01 +0000 (-0700)
Subject: Remove incorrect definition of nested local variables.
X-Git-Tag: android-x86-2.2~564^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a0e7b60d4648ea47456d33ceee79493a43da8160;p=android-x86%2Fdalvik.git

Remove incorrect definition of nested local variables.
---

diff --git a/vm/compiler/codegen/arm/Codegen.c b/vm/compiler/codegen/arm/Codegen.c
index 2e735faf0..4a85fb255 100644
--- a/vm/compiler/codegen/arm/Codegen.c
+++ b/vm/compiler/codegen/arm/Codegen.c
@@ -2794,13 +2794,12 @@ static bool handleFmt22c(CompilationUnit *cUnit, MIR *mir)
     if (dalvikOpCode >= OP_IGET && dalvikOpCode <= OP_IPUT_SHORT) {
         InstField *pInstField = (InstField *)
             cUnit->method->clazz->pDvmDex->pResFields[mir->dalvikInsn.vC];
-        int fieldOffset;
 
         assert(pInstField != NULL);
         fieldOffset = pInstField->byteOffset;
     } else {
-        /* To make the compiler happy */
-        fieldOffset = 0;
+        /* Deliberately break the code while make the compiler happy */
+        fieldOffset = -1;
     }
     switch (dalvikOpCode) {
         case OP_NEW_ARRAY: {