resolved conflicts for merge of 6d55b332 to master

Change-Id: I21e35d4cdf2636ae3cd7facd45ad4f5c4ab82e7b

1 files changed, 4 insertions, 4 deletions

diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c
index 481bea353..afe964a06 100644
--- a/vm/compiler/codegen/arm/CodegenDriver.c
+++ b/vm/compiler/codegen/arm/CodegenDriver.c
@@ -1545,20 +1545,20 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir)
 
             rlSrc = dvmCompilerGetSrc(cUnit, mir, 0);
             rlSrc = loadValue(cUnit, rlSrc, kAnyReg);
-            loadConstant(cUnit, tReg,  (int) fieldPtr + valOffset);
+            loadConstant(cUnit, tReg,  (int) fieldPtr);
             if (isSputObject) {
                 objHead = dvmCompilerAllocTemp(cUnit);
-                loadConstant(cUnit, objHead, (intptr_t)method->clazz);
+                loadWordDisp(cUnit, tReg, offsetof(Field, clazz), objHead);
             }
             HEAP_ACCESS_SHADOW(true);
-            storeWordDisp(cUnit, tReg, 0 ,rlSrc.lowReg);
+            storeWordDisp(cUnit, tReg, valOffset ,rlSrc.lowReg);
             dvmCompilerFreeTemp(cUnit, tReg);
             HEAP_ACCESS_SHADOW(false);
             if (isVolatile) {
                 dvmCompilerGenMemBarrier(cUnit);
             }
             if (isSputObject) {
-                /* NOTE: marking card based object head */
+                /* NOTE: marking card based sfield->clazz */
                 markCard(cUnit, rlSrc.lowReg, objHead);
                 dvmCompilerFreeTemp(cUnit, objHead);
             }