From 51c2467e8771b56e25ae4f17f66522f979f57a7e Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Thu, 11 Jul 2013 16:00:56 -0700 Subject: libart-compiler cleanup - Move compile-time code to src/compiler and libart-compiler OatWriter, ImageWriter, ElfWriter, ElfFixup, ElfStripper, stub generation - Move ClassReference and MethodReference to remove MethodVerifier dependency on CompilerDriver - Move runtime_support_llvm.cc out of src/compiler and next to runtime_support.cc - Change dex2oat and gtests to directly depend on libart-compiler - Move non-common definitions from Android.common.mk to more specific makefiles - Add LOCAL_ADDITIONAL_DEPENDENCIES on appropriate makefiles Change-Id: I897027e69945914128f21f317a92caf9255bc600 --- src/compiler/llvm/gbc_expander.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/compiler/llvm/gbc_expander.cc') diff --git a/src/compiler/llvm/gbc_expander.cc b/src/compiler/llvm/gbc_expander.cc index bdf9aca68f..4702b37de1 100644 --- a/src/compiler/llvm/gbc_expander.cc +++ b/src/compiler/llvm/gbc_expander.cc @@ -19,6 +19,7 @@ #include "dex_file-inl.h" #include "intrinsic_helper.h" #include "ir_builder.h" +#include "method_reference.h" #include "mirror/abstract_method.h" #include "mirror/array.h" #include "mirror/string.h" @@ -776,8 +777,8 @@ llvm::Value* GBCExpanderPass::EmitInvoke(llvm::CallInst& call_inst) { art::InvokeType invoke_type = static_cast(LV2UInt(call_inst.getArgOperand(0))); bool is_static = (invoke_type == art::kStatic); - art::CompilerDriver::MethodReference target_method(dex_compilation_unit_->GetDexFile(), - LV2UInt(call_inst.getArgOperand(1))); + art::MethodReference target_method(dex_compilation_unit_->GetDexFile(), + LV2UInt(call_inst.getArgOperand(1))); // Load *this* actual parameter llvm::Value* this_addr = (!is_static) ? call_inst.getArgOperand(3) : NULL; -- cgit v1.2.3-59-g8ed1b