From 66f19258f9728d4ffe026074d8fd429d639802fa Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Tue, 18 Sep 2012 08:57:04 -0700 Subject: Change dex cache to be java object instead of array, add pointer to dex file in dex cache. Generic clean up to facilitate having GDB macros for Pretty* helper functions. Improved cleanliness of DexCache since having it as an object array was not the best solution. Fixed a bug in InOrderWalk caused by ResolveType sometimes allocating classes. Rename C++ Method to AbstractMethod and add two new classes Constructor, Method which both inherit from AbstractMethod. Rename done to have the C++ code be closer to the java code. Change-Id: I4995b4c5e47a3822192b08afa24a639d3b1f4da9 --- src/compiler_llvm/jni_compiler.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/compiler_llvm/jni_compiler.cc') diff --git a/src/compiler_llvm/jni_compiler.cc b/src/compiler_llvm/jni_compiler.cc index 8bb8b8759b..5bc3bfcbe7 100644 --- a/src/compiler_llvm/jni_compiler.cc +++ b/src/compiler_llvm/jni_compiler.cc @@ -80,7 +80,7 @@ CompiledMethod* JniCompiler::Compile() { // Load class object this_object_or_class_object = irb_.LoadFromObjectOffset(method_object_addr, - Method::DeclaringClassOffset().Int32Value(), + AbstractMethod::DeclaringClassOffset().Int32Value(), irb_.getJObjectTy(), kTBAAConstJObject); } @@ -124,7 +124,7 @@ CompiledMethod* JniCompiler::Compile() { // Get callee code_addr llvm::Value* code_addr = irb_.LoadFromObjectOffset(method_object_addr, - Method::NativeMethodOffset().Int32Value(), + AbstractMethod::NativeMethodOffset().Int32Value(), GetFunctionType(method_idx_, is_static, true)->getPointerTo(), kTBAAJRuntime); -- cgit v1.2.3-59-g8ed1b