From: buzbee <buzbee@google.com>
Date: Thu, 31 Mar 2011 18:18:28 +0000 (-0700)
Subject: Add missing JUMBO ops [fixed]
X-Git-Tag: android-x86-4.0-r1~156^2~4^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3a56e9d90e0afa8f293ea94a8fcb7cb017bbe9a6;p=android-x86%2Fdalvik.git

Add missing JUMBO ops [fixed]

Neglected to git-add the most recent version in Change I0c0b6d17.

Change-Id: I5f9e630f652edcf70ab893ade6f559056ed31f8f
---

diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c
index 7d76e890f..e80ac0f9a 100644
--- a/vm/compiler/codegen/arm/CodegenDriver.c
+++ b/vm/compiler/codegen/arm/CodegenDriver.c
@@ -1636,7 +1636,7 @@ static bool handleFmt21c_Fmt31c_Fmt41c(CompilationUnit *cUnit, MIR *mir)
             }
 
             isVolatile = (opcode == OP_SGET_VOLATILE) ||
-                         (opcode == OP_SGET_VOLATILE_VOLATILE) ||
+                         (opcode == OP_SGET_VOLATILE_JUMBO) ||
                          (opcode == OP_SGET_OBJECT_VOLATILE) ||
                          (opcode == OP_SGET_OBJECT_VOLATILE_JUMBO) ||
                          dvmIsVolatileField((Field *) fieldPtr);