diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-07-17 10:02:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-17 10:02:46 +0000 |
| commit | 32f59e585a1f8932f2a4ab3f934a0a83e29b3d19 (patch) | |
| tree | dc288250d7f78dbf982cbc5bea952b0907c05ce5 /compiler/optimizing/optimizing_compiler.cc | |
| parent | c3c0a06bea879741972add3dfc8099de729856a1 (diff) | |
| parent | 8ab9a9010f3929acbb6c671008b8885b762b01e1 (diff) | |
Merge "Revert "Use the quickened metadata to compile -QUICK opcodes.""
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 03141d2415..aeb1ae20a3 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -35,7 +35,6 @@ #include "dex/verified_method.h" #include "dex/verification_results.h" #include "driver/compiler_driver.h" -#include "driver/compiler_driver-inl.h" #include "driver/compiler_options.h" #include "driver/dex_compilation_unit.h" #include "elf_writer_quick.h" @@ -566,7 +565,7 @@ CompiledMethod* OptimizingCompiler::TryCompile(const DexFile::CodeItem* code_ite } DexCompilationUnit dex_compilation_unit( - nullptr, class_loader, Runtime::Current()->GetClassLinker(), dex_file, code_item, + nullptr, class_loader, art::Runtime::Current()->GetClassLinker(), dex_file, code_item, class_def_idx, method_idx, access_flags, compiler_driver->GetVerifiedMethod(&dex_file, method_idx)); @@ -603,25 +602,12 @@ CompiledMethod* OptimizingCompiler::TryCompile(const DexFile::CodeItem* code_ite visualizer_output_.get(), compiler_driver); - const uint8_t* interpreter_metadata = nullptr; - { - ScopedObjectAccess soa(Thread::Current()); - StackHandleScope<4> hs(soa.Self()); - ClassLinker* class_linker = dex_compilation_unit.GetClassLinker(); - Handle<mirror::DexCache> dex_cache(hs.NewHandle(class_linker->FindDexCache(dex_file))); - Handle<mirror::ClassLoader> loader(hs.NewHandle( - soa.Decode<mirror::ClassLoader*>(class_loader))); - ArtMethod* art_method = compiler_driver->ResolveMethod( - soa, dex_cache, loader, &dex_compilation_unit, method_idx, invoke_type); - interpreter_metadata = art_method->GetQuickenedInfo(); - } HGraphBuilder builder(graph, &dex_compilation_unit, &dex_compilation_unit, &dex_file, compiler_driver, - compilation_stats_.get(), - interpreter_metadata); + compilation_stats_.get()); VLOG(compiler) << "Building " << method_name; |