From 1caa2c205e51dda670207828f25451fb7623cea6 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Sun, 28 Aug 2011 13:02:33 -0700 Subject: Add InitializedStaticStorage table A non-null entry in the table not only provides access to the storage, it also implies that the referenced type is initialized. Change-Id: Ief9e88b7e58b65b6f9456a4218b7fe87f71c17bb --- src/compiler/codegen/arm/MethodCodegenDriver.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/compiler/codegen/arm/MethodCodegenDriver.cc') diff --git a/src/compiler/codegen/arm/MethodCodegenDriver.cc b/src/compiler/codegen/arm/MethodCodegenDriver.cc index c83a2a4a09..bd50742f35 100644 --- a/src/compiler/codegen/arm/MethodCodegenDriver.cc +++ b/src/compiler/codegen/arm/MethodCodegenDriver.cc @@ -346,7 +346,7 @@ static int nextSDCallInsnSP(CompilationUnit* cUnit, MIR* mir, break; case 3: // Method->DeclaringClass()->GetDexCache()->methodsObjectArr loadBaseDisp(cUnit, mir, r0, - art::DexCache::MethodsOffset().Int32Value(), r0, + art::DexCache::ResolvedMethodsOffset().Int32Value(), r0, kWord, INVALID_SREG); break; case 4: // Skip past the object header @@ -444,7 +444,7 @@ static int nextVCallInsnSP(CompilationUnit* cUnit, MIR* mir, break; case 3: // ...()->GetDexCache()->methodsObjectArr [uses/sets r0] loadBaseDisp(cUnit, mir, r0, - art::DexCache::MethodsOffset().Int32Value(), r0, + art::DexCache::ResolvedMethodsOffset().Int32Value(), r0, kWord, INVALID_SREG); // Load "this" [set r1] rlArg = oatGetSrc(cUnit, mir, 0); -- cgit v1.2.3-59-g8ed1b