diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/common_compiler_test.cc | 3 | ||||
| -rw-r--r-- | compiler/dex/quick_compiler_callbacks.h | 5 | ||||
| -rw-r--r-- | compiler/driver/compiler_driver_test.cc | 5 | ||||
| -rw-r--r-- | compiler/jit/jit_compiler.cc | 3 | ||||
| -rw-r--r-- | compiler/oat_test.cc | 3 |
5 files changed, 11 insertions, 8 deletions
diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc index 09be4372a8..d506cc21e9 100644 --- a/compiler/common_compiler_test.cc +++ b/compiler/common_compiler_test.cc @@ -178,7 +178,8 @@ void CommonCompilerTest::SetUpRuntimeOptions(RuntimeOptions* options) { 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())); + method_inliner_map_.get(), + false)); 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 cdf71b642e..56706e3e35 100644 --- a/compiler/dex/quick_compiler_callbacks.h +++ b/compiler/dex/quick_compiler_callbacks.h @@ -27,8 +27,9 @@ class DexFileToMethodInlinerMap; class QuickCompilerCallbacks FINAL : public CompilerCallbacks { public: QuickCompilerCallbacks(VerificationResults* verification_results, - DexFileToMethodInlinerMap* method_inliner_map) - : verification_results_(verification_results), + DexFileToMethodInlinerMap* method_inliner_map, + bool boot_image) + : CompilerCallbacks(boot_image), verification_results_(verification_results), method_inliner_map_(method_inliner_map) { CHECK(verification_results != nullptr); CHECK(method_inliner_map != nullptr); diff --git a/compiler/driver/compiler_driver_test.cc b/compiler/driver/compiler_driver_test.cc index a02e25edde..5ebc029fcf 100644 --- a/compiler/driver/compiler_driver_test.cc +++ b/compiler/driver/compiler_driver_test.cc @@ -41,7 +41,7 @@ class CompilerDriverTest : public CommonCompilerTest { TimingLogger timings("CompilerDriverTest::CompileAll", false, false); TimingLogger::ScopedTiming t(__FUNCTION__, &timings); compiler_driver_->CompileAll(class_loader, - Runtime::Current()->GetCompileTimeClassPath(class_loader), + GetDexFiles(class_loader), &timings); t.NewTiming("MakeAllExecutable"); MakeAllExecutable(class_loader); @@ -66,8 +66,7 @@ class CompilerDriverTest : public CommonCompilerTest { } void MakeAllExecutable(jobject class_loader) { - const std::vector<const DexFile*>& class_path - = Runtime::Current()->GetCompileTimeClassPath(class_loader); + const std::vector<const DexFile*> class_path = GetDexFiles(class_loader); for (size_t i = 0; i != class_path.size(); ++i) { const DexFile* dex_file = class_path[i]; CHECK(dex_file != NULL); diff --git a/compiler/jit/jit_compiler.cc b/compiler/jit/jit_compiler.cc index 8b311542f6..d034736f95 100644 --- a/compiler/jit/jit_compiler.cc +++ b/compiler/jit/jit_compiler.cc @@ -89,7 +89,8 @@ JitCompiler::JitCompiler() : total_time_(0) { 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())); + method_inliner_map_.get(), + false)); 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 c426625ae1..440c1b634c 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -86,7 +86,8 @@ TEST_F(OatTest, WriteRead) { 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())); + method_inliner_map_.get(), + false)); timer_.reset(new CumulativeLogger("Compilation times")); compiler_driver_.reset(new CompilerDriver(compiler_options_.get(), verification_results_.get(), |