commit cd05a6274782c50a2b990c18b5f8d5ae5e44d509
author Shih-wei Liao <sliao@google.com> Wed Aug 15 00:02:05 2012 -0700
committer TDYa127 <tdy@google.com> Wed Aug 15 04:01:15 2012 -0700
tree 1a202f979454f8b6a1e4294776d52d20c526efc0
parent ef0a2ca1f719f64af59db08861edb73739bf5220

Global lock levels for the LLVM side.

Change-Id: Id2807c8775686bc38f79e13c097fadda2d96d042

src/compiler_llvm/compiler_llvm.cc

diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc
index 635fde3..e52478b 100644
--- a/src/compiler_llvm/compiler_llvm.cc
+++ b/src/compiler_llvm/compiler_llvm.cc
@@ -21,7 +21,6 @@
 #include "compilation_unit.h"
 #include "compiled_method.h"
 #include "compiler.h"
-#include "dex_cache.h"
 #include "ir_builder.h"
 #include "jni_compiler.h"
 #include "method_compiler.h"
@@ -193,14 +192,13 @@
 extern "C" art::CompiledMethod* ArtCompileMethod(art::Compiler& compiler,
                                                  const art::DexFile::CodeItem* code_item,
                                                  uint32_t access_flags, uint32_t method_idx,
-                                                 art::ClassLoader* class_loader,
+                                                 jobject class_loader,
                                                  const art::DexFile& dex_file)
 {
   art::ClassLinker *class_linker = art::Runtime::Current()->GetClassLinker();
-  art::DexCache *dex_cache = class_linker->FindDexCache(dex_file);
 
   art::OatCompilationUnit oat_compilation_unit(
-    class_loader, class_linker, dex_file, *dex_cache, code_item,
+    class_loader, class_linker, dex_file, code_item,
     method_idx, access_flags);
   art::compiler_llvm::CompilerLLVM* compiler_llvm = ContextOf(compiler);
   art::CompiledMethod* result = compiler_llvm->CompileDexMethod(&oat_compilation_unit);
@@ -211,10 +209,9 @@
                                                     uint32_t access_flags, uint32_t method_idx,
                                                     const art::DexFile& dex_file) {
   art::ClassLinker *class_linker = art::Runtime::Current()->GetClassLinker();
-  art::DexCache *dex_cache = class_linker->FindDexCache(dex_file);
 
   art::OatCompilationUnit oat_compilation_unit(
-    NULL, class_linker, dex_file, *dex_cache, NULL,
+    NULL, class_linker, dex_file, NULL,
     method_idx, access_flags);
 
   art::compiler_llvm::CompilerLLVM* compiler_llvm = ContextOf(compiler);