From 4028312f6f4b49fd69992daf28cd37dd32e79a47 Mon Sep 17 00:00:00 2001
From: jeffhao <jeffhao@google.com>
Date: Tue, 15 Jan 2013 13:15:24 -0800
Subject: Prune dexlang from the llvm compiler.

Change-Id: I176d5226f71e96368d5264d88d38c786ad416a97
---
 src/compiler_llvm/compiler_llvm.cc | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'src/compiler_llvm/compiler_llvm.cc')

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) {
-- 
cgit v1.2.3-59-g8ed1b