From 762869dee6e0eadab5be1c606792d6693bbabf4e Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 15 Jul 2016 15:28:35 +0100 Subject: Simplify our intrinsic recognizer. - Use the modifiers for storing the intrinsic kind. - Delete dex_file_method_inliner and its associated map. This work was also motivated by the fact that the inline method analyzer leaks intrinsic tables, and even worse, might re-use a table from one dex file to another unrelated dex file in the presence of class unloading and the unlikely event of the dex files getting the same address. test: m test-art-host m test-art-target Change-Id: Ia653d2c72df13889dc85dd8c84997582c034ea4b --- compiler/common_compiler_test.cc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'compiler/common_compiler_test.cc') diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc index 63abfeb71e..b726649138 100644 --- a/compiler/common_compiler_test.cc +++ b/compiler/common_compiler_test.cc @@ -23,7 +23,6 @@ #include "class_linker.h" #include "compiled_method.h" #include "dex/quick_compiler_callbacks.h" -#include "dex/quick/dex_file_to_method_inliner_map.h" #include "dex/verification_results.h" #include "driver/compiler_driver.h" #include "driver/compiler_options.h" @@ -177,7 +176,6 @@ void CommonCompilerTest::CreateCompilerDriver(Compiler::Kind kind, size_t number_of_threads) { compiler_driver_.reset(new CompilerDriver(compiler_options_.get(), verification_results_.get(), - method_inliner_map_.get(), kind, isa, instruction_set_features_.get(), @@ -201,9 +199,7 @@ void CommonCompilerTest::SetUpRuntimeOptions(RuntimeOptions* options) { compiler_options_.reset(new CompilerOptions); verification_results_.reset(new VerificationResults(compiler_options_.get())); - method_inliner_map_.reset(new DexFileToMethodInlinerMap); callbacks_.reset(new QuickCompilerCallbacks(verification_results_.get(), - method_inliner_map_.get(), CompilerCallbacks::CallbackMode::kCompileApp)); } @@ -224,7 +220,6 @@ void CommonCompilerTest::TearDown() { timer_.reset(); compiler_driver_.reset(); callbacks_.reset(); - method_inliner_map_.reset(); verification_results_.reset(); compiler_options_.reset(); image_reservation_.reset(); -- cgit v1.2.3-59-g8ed1b