diff options
| author | 2013-01-15 13:15:24 -0800 | |
|---|---|---|
| committer | 2013-01-15 13:15:24 -0800 | |
| commit | 4028312f6f4b49fd69992daf28cd37dd32e79a47 (patch) | |
| tree | 529d7bbcb15a6b2824413aa52ca1440a1d15c21a /src/compiler_llvm/compiler_llvm.cc | |
| parent | 2281a0ea6e3fbb7a26bd7ca030ee20296b8fed58 (diff) | |
Prune dexlang from the llvm compiler.
Change-Id: I176d5226f71e96368d5264d88d38c786ad416a97
Diffstat (limited to 'src/compiler_llvm/compiler_llvm.cc')
| -rw-r--r-- | src/compiler_llvm/compiler_llvm.cc | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc index c807b3ded7..97d005c67f 100644 --- a/src/compiler_llvm/compiler_llvm.cc +++ b/src/compiler_llvm/compiler_llvm.cc @@ -24,9 +24,7 @@ #include "compiler.h" #include "ir_builder.h" #include "jni_compiler.h" -#ifndef ART_USE_DEXLANG_FRONTEND -# include "method_compiler.h" -#endif +#include "method_compiler.h" #include "oat_compilation_unit.h" #include "oat_file.h" #include "stub_compiler.h" @@ -141,20 +139,7 @@ CompiledMethod* CompilerLLVM:: CompileDexMethod(OatCompilationUnit* oat_compilation_unit, InvokeType invoke_type) { UniquePtr<CompilationUnit> cunit(AllocateCompilationUnit()); -#if defined(ART_USE_DEXLANG_FRONTEND) - // Run DexLang for Dex to Greenland Bitcode - UniquePtr<greenland::DexLang> dex_lang( - new greenland::DexLang(*cunit->GetDexLangContext(), *compiler_, - *oat_compilation_unit)); - - llvm::Function* func = dex_lang->Build(); - CHECK(func != NULL); - - cunit->Materialize(); - - return new CompiledMethod(cunit->GetInstructionSet(), - cunit->GetCompiledCode()); -#elif defined(ART_USE_PORTABLE_COMPILER) +#if defined(ART_USE_PORTABLE_COMPILER) std::string methodName(PrettyMethod(oat_compilation_unit->GetDexMethodIndex(), *oat_compilation_unit->GetDexFile())); if (insn_set_ == kX86) { |