commit 6a9967818deb13e31846cce083227e32517edf38
author Ian Rogers <irogers@google.com> Mon Oct 31 17:06:39 2011 -0700
committer Ian Rogers <irogers@google.com> Mon Oct 31 17:06:39 2011 -0700
tree 2fda2d77ab6a4e0169c9fff07d2236fa338c7300
parent b093c6b27f8ea9bbe2d49c03ebe345203a121199

Ensure r0/ref isn't clobbered by call.

Change-Id: Ic45dac1feb0b45cccfd72589ecee9ea74ee6d869

src/compiler/codegen/arm/Thumb2/Gen.cc

diff --git a/src/compiler/codegen/arm/Thumb2/Gen.cc b/src/compiler/codegen/arm/Thumb2/Gen.cc
index e58a982..82ee016 100644
--- a/src/compiler/codegen/arm/Thumb2/Gen.cc
+++ b/src/compiler/codegen/arm/Thumb2/Gen.cc
@@ -726,7 +726,6 @@
     oatLockCallTemps(cUnit);
     uint32_t type_idx = mir->dalvikInsn.vC;
     loadCurrMethodDirect(cUnit, r1);  // r1 <= current Method*
-    loadValueDirectFixed(cUnit, rlSrc, r0);  // r0 <= ref
     int classReg = r2;  // r2 will hold the Class*
     if (!cUnit->compiler->CanAccessTypeWithoutChecks(cUnit->method, type_idx)) {
         // Check we have access to type_idx and if not throw IllegalAccessError,
@@ -737,8 +736,10 @@
         loadConstant(cUnit, r0, type_idx);
         callRuntimeHelper(cUnit, rLR);  // InitializeTypeAndVerifyAccess(idx, method)
         genRegCopy(cUnit, classReg, r0);  // Align usage with fast path
+        loadValueDirectFixed(cUnit, rlSrc, r0);  // r0 <= ref
     } else {
         // Load dex cache entry into classReg (r2)
+        loadValueDirectFixed(cUnit, rlSrc, r0);  // r0 <= ref
         loadWordDisp(cUnit, r1, Method::DexCacheResolvedTypesOffset().Int32Value(), classReg);
         int32_t offset_of_type = Array::DataOffset().Int32Value() + (sizeof(Class*) * type_idx);
         loadWordDisp(cUnit, classReg, offset_of_type, classReg);