diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-27 23:45:15 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-03-27 23:46:09 -0700 |
| commit | 4585f876eb5dfb936bd0d6cb6acd78a1f2182ba6 (patch) | |
| tree | e9dfed086f56245e74862caa813c708bc4f500f9 /compiler | |
| parent | e2c29f4a2717923f190c944a06e02f7d8c3ddcb6 (diff) | |
| download | android_art-4585f876eb5dfb936bd0d6cb6acd78a1f2182ba6.tar.gz android_art-4585f876eb5dfb936bd0d6cb6acd78a1f2182ba6.tar.bz2 android_art-4585f876eb5dfb936bd0d6cb6acd78a1f2182ba6.zip | |
ART: Some runtime cleanup
Use an enum for the compiler-callback mode.
Refactor and remove some unnecessary includes in runtime.h.
Change-Id: If2245fa470171311b8e05b677cf6bb28f209585a
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/common_compiler_test.cc | 2 | ||||
| -rw-r--r-- | compiler/dex/quick_compiler_callbacks.h | 4 | ||||
| -rw-r--r-- | compiler/jit/jit_compiler.cc | 2 | ||||
| -rw-r--r-- | compiler/oat_test.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc index d506cc21e9..257406a622 100644 --- a/compiler/common_compiler_test.cc +++ b/compiler/common_compiler_test.cc @@ -179,7 +179,7 @@ void CommonCompilerTest::SetUpRuntimeOptions(RuntimeOptions* options) { method_inliner_map_.reset(new DexFileToMethodInlinerMap); callbacks_.reset(new QuickCompilerCallbacks(verification_results_.get(), method_inliner_map_.get(), - false)); + CompilerCallbacks::CallbackMode::kCompileApp)); options->push_back(std::make_pair("compilercallbacks", callbacks_.get())); } diff --git a/compiler/dex/quick_compiler_callbacks.h b/compiler/dex/quick_compiler_callbacks.h index 56706e3e35..d692d26229 100644 --- a/compiler/dex/quick_compiler_callbacks.h +++ b/compiler/dex/quick_compiler_callbacks.h @@ -28,8 +28,8 @@ class QuickCompilerCallbacks FINAL : public CompilerCallbacks { public: QuickCompilerCallbacks(VerificationResults* verification_results, DexFileToMethodInlinerMap* method_inliner_map, - bool boot_image) - : CompilerCallbacks(boot_image), verification_results_(verification_results), + CompilerCallbacks::CallbackMode mode) + : CompilerCallbacks(mode), verification_results_(verification_results), method_inliner_map_(method_inliner_map) { CHECK(verification_results != nullptr); CHECK(method_inliner_map != nullptr); diff --git a/compiler/jit/jit_compiler.cc b/compiler/jit/jit_compiler.cc index d034736f95..df5d5cca3b 100644 --- a/compiler/jit/jit_compiler.cc +++ b/compiler/jit/jit_compiler.cc @@ -90,7 +90,7 @@ JitCompiler::JitCompiler() : total_time_(0) { method_inliner_map_.reset(new DexFileToMethodInlinerMap); callbacks_.reset(new QuickCompilerCallbacks(verification_results_.get(), method_inliner_map_.get(), - false)); + CompilerCallbacks::CallbackMode::kCompileApp)); compiler_driver_.reset(new CompilerDriver( compiler_options_.get(), verification_results_.get(), method_inliner_map_.get(), Compiler::kQuick, instruction_set, instruction_set_features_.get(), false, diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index 440c1b634c..d59ad6c32f 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -87,7 +87,7 @@ TEST_F(OatTest, WriteRead) { method_inliner_map_.reset(new DexFileToMethodInlinerMap); callbacks_.reset(new QuickCompilerCallbacks(verification_results_.get(), method_inliner_map_.get(), - false)); + CompilerCallbacks::CallbackMode::kCompileApp)); timer_.reset(new CumulativeLogger("Compilation times")); compiler_driver_.reset(new CompilerDriver(compiler_options_.get(), verification_results_.get(), |