commit 8b977d38483aaa08abcbdaa5fa888076c1142169
author Logan Chien <loganchien@google.com> Tue Feb 21 19:14:55 2012 +0800
committer Shih-wei Liao <sliao@google.com> Wed Feb 29 17:11:27 2012 -0800
tree ae61c7cb1c397582f22c5c585bb0b531fd8f59b0
parent 88894ee835411de72025cd8a5d8d111a6f2a004a

Compile llvm.Module into ELF object file.

Change-Id: I8faf7427944324c9bac12573d217cde2a2e658f1

src/compiler_llvm/jni_compiler.cc

diff --git a/src/compiler_llvm/jni_compiler.cc b/src/compiler_llvm/jni_compiler.cc
index f97e4fe..0e02846 100644
--- a/src/compiler_llvm/jni_compiler.cc
+++ b/src/compiler_llvm/jni_compiler.cc
@@ -17,6 +17,7 @@
 #include "jni_compiler.h"
 
 #include "class_linker.h"
+#include "compilation_unit.h"
 #include "compiled_method.h"
 #include "compiler.h"
 #include "compiler_llvm.h"
@@ -35,14 +36,11 @@
 namespace compiler_llvm {
 
 
-JniCompiler::JniCompiler(InstructionSet insn_set,
+JniCompiler::JniCompiler(CompilationUnit* cunit,
                          Compiler const& compiler,
                          OatCompilationUnit* oat_compilation_unit)
-: insn_set_(insn_set), compiler_(&compiler),
-  compiler_llvm_(compiler_->GetCompilerLLVM()),
-  module_(compiler_llvm_->GetModule()),
-  context_(compiler_llvm_->GetLLVMContext()),
-  irb_(*compiler_llvm_->GetIRBuilder()),
+: cunit_(cunit), compiler_(&compiler), module_(cunit_->GetModule()),
+  context_(cunit_->GetLLVMContext()), irb_(*cunit_->GetIRBuilder()),
   oat_compilation_unit_(oat_compilation_unit),
   access_flags_(oat_compilation_unit->access_flags_),
   method_idx_(oat_compilation_unit->method_idx_),
@@ -63,7 +61,7 @@
 CompiledMethod* JniCompiler::Compile() {
   CreateFunction();
 
-  return new CompiledMethod(insn_set_, func_);
+  return new CompiledMethod(cunit_->GetInstructionSet(), func_);
 }