diff options
| -rw-r--r-- | compiler/common_compiler_test.cc | 1 | ||||
| -rw-r--r-- | compiler/common_compiler_test.h | 1 | ||||
| -rw-r--r-- | compiler/oat_test.cc | 3 | ||||
| -rw-r--r-- | runtime/common_runtime_test.cc | 10 | ||||
| -rw-r--r-- | runtime/common_runtime_test.h | 3 | ||||
| -rw-r--r-- | runtime/oat_file_assistant_test.cc | 7 |
6 files changed, 12 insertions, 13 deletions
diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc index 257406a622..1d0aad5425 100644 --- a/compiler/common_compiler_test.cc +++ b/compiler/common_compiler_test.cc @@ -180,7 +180,6 @@ void CommonCompilerTest::SetUpRuntimeOptions(RuntimeOptions* options) { callbacks_.reset(new QuickCompilerCallbacks(verification_results_.get(), method_inliner_map_.get(), CompilerCallbacks::CallbackMode::kCompileApp)); - options->push_back(std::make_pair("compilercallbacks", callbacks_.get())); } void CommonCompilerTest::TearDown() { diff --git a/compiler/common_compiler_test.h b/compiler/common_compiler_test.h index 9cffbc86f3..d7b210d571 100644 --- a/compiler/common_compiler_test.h +++ b/compiler/common_compiler_test.h @@ -78,7 +78,6 @@ class CommonCompilerTest : public CommonRuntimeTest { std::unique_ptr<CompilerOptions> compiler_options_; std::unique_ptr<VerificationResults> verification_results_; std::unique_ptr<DexFileToMethodInlinerMap> method_inliner_map_; - std::unique_ptr<CompilerCallbacks> callbacks_; std::unique_ptr<CompilerDriver> compiler_driver_; std::unique_ptr<CumulativeLogger> timer_; std::unique_ptr<const InstructionSetFeatures> instruction_set_features_; diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index d59ad6c32f..afd39e8874 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -85,9 +85,6 @@ TEST_F(OatTest, WriteRead) { 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)); timer_.reset(new CumulativeLogger("Compilation times")); compiler_driver_.reset(new CompilerDriver(compiler_options_.get(), verification_results_.get(), diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc index 4104509608..d400010e4b 100644 --- a/runtime/common_runtime_test.cc +++ b/runtime/common_runtime_test.cc @@ -220,7 +220,6 @@ void CommonRuntimeTest::SetUp() { std::string min_heap_string(StringPrintf("-Xms%zdm", gc::Heap::kDefaultInitialSize / MB)); std::string max_heap_string(StringPrintf("-Xmx%zdm", gc::Heap::kDefaultMaximumSize / MB)); - callbacks_.reset(new NoopCompilerCallbacks()); RuntimeOptions options; std::string boot_class_path_string = "-Xbootclasspath:" + GetLibCoreDexFileName(); @@ -228,9 +227,16 @@ void CommonRuntimeTest::SetUp() { options.push_back(std::make_pair("-Xcheck:jni", nullptr)); options.push_back(std::make_pair(min_heap_string, nullptr)); options.push_back(std::make_pair(max_heap_string, nullptr)); - options.push_back(std::make_pair("compilercallbacks", callbacks_.get())); + + callbacks_.reset(new NoopCompilerCallbacks()); + SetUpRuntimeOptions(&options); + // Install compiler-callbacks if SetupRuntimeOptions hasn't deleted them. + if (callbacks_.get() != nullptr) { + options.push_back(std::make_pair("compilercallbacks", callbacks_.get())); + } + PreRuntimeCreate(); if (!Runtime::Create(options, false)) { LOG(FATAL) << "Failed to create runtime"; diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h index a29487fff4..5fbc2ee680 100644 --- a/runtime/common_runtime_test.h +++ b/runtime/common_runtime_test.h @@ -140,10 +140,11 @@ class CommonRuntimeTest : public testing::Test { // Get the first dex file from a PathClassLoader. Will abort if it is null. const DexFile* GetFirstDexFile(jobject jclass_loader); + std::unique_ptr<CompilerCallbacks> callbacks_; + private: static std::string GetCoreFileLocation(const char* suffix); - std::unique_ptr<CompilerCallbacks> callbacks_; std::vector<std::unique_ptr<const DexFile>> loaded_dex_files_; }; diff --git a/runtime/oat_file_assistant_test.cc b/runtime/oat_file_assistant_test.cc index b2798d3e8b..0422fcda1a 100644 --- a/runtime/oat_file_assistant_test.cc +++ b/runtime/oat_file_assistant_test.cc @@ -27,6 +27,7 @@ #include "class_linker.h" #include "common_runtime_test.h" +#include "compiler_callbacks.h" #include "mem_map.h" #include "os.h" #include "thread-inl.h" @@ -77,11 +78,7 @@ class OatFileAssistantTest : public CommonRuntimeTest { nullptr)); // Make sure compilercallbacks are not set so that relocation will be // enabled. - for (std::pair<std::string, const void*>& pair : *options) { - if (pair.first == "compilercallbacks") { - pair.second = nullptr; - } - } + callbacks_.reset(); } virtual void PreRuntimeCreate() { |