diff options
| author | 2012-09-18 08:57:04 -0700 | |
|---|---|---|
| committer | 2012-09-21 17:32:56 -0700 | |
| commit | 66f19258f9728d4ffe026074d8fd429d639802fa (patch) | |
| tree | fd94009774c6cbbb1528ea096e606133bd35f104 /src/compiler_llvm/jni_compiler.cc | |
| parent | a5e1e3d153990845d80cb8d013157210f11a473c (diff) | |
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
Diffstat (limited to 'src/compiler_llvm/jni_compiler.cc')
| -rw-r--r-- | src/compiler_llvm/jni_compiler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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); |