diff options
Diffstat (limited to 'compiler/image_test.h')
| -rw-r--r-- | compiler/image_test.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/compiler/image_test.h b/compiler/image_test.h index 2f15ff4815..a2d5a05604 100644 --- a/compiler/image_test.h +++ b/compiler/image_test.h @@ -84,9 +84,10 @@ class ImageTest : public CommonCompilerTest { void SetUpRuntimeOptions(RuntimeOptions* options) OVERRIDE { CommonCompilerTest::SetUpRuntimeOptions(options); - callbacks_.reset(new QuickCompilerCallbacks( - verification_results_.get(), - CompilerCallbacks::CallbackMode::kCompileBootImage)); + QuickCompilerCallbacks* new_callbacks = + new QuickCompilerCallbacks(CompilerCallbacks::CallbackMode::kCompileBootImage); + new_callbacks->SetVerificationResults(verification_results_.get()); + callbacks_.reset(new_callbacks); options->push_back(std::make_pair("compilercallbacks", callbacks_.get())); } @@ -213,14 +214,15 @@ inline void CompilationHelper::Compile(CompilerDriver* driver, /*compile_app_image*/false, storage_mode, oat_filename_vector, - dex_file_to_oat_index_map)); + dex_file_to_oat_index_map, + /*dirty_image_objects*/nullptr)); { { jobject class_loader = nullptr; TimingLogger timings("ImageTest::WriteRead", false, false); TimingLogger::ScopedTiming t("CompileAll", &timings); driver->SetDexFilesForOatFile(class_path); - driver->CompileAll(class_loader, class_path, /* verifier_deps */ nullptr, &timings); + driver->CompileAll(class_loader, class_path, &timings); t.NewTiming("WriteElf"); SafeMap<std::string, std::string> key_value_store; @@ -290,9 +292,9 @@ inline void CompilationHelper::Compile(CompilerDriver* driver, if (kIsVdexEnabled) { for (size_t i = 0, size = vdex_files.size(); i != size; ++i) { - std::unique_ptr<BufferedOutputStream> vdex_out( - MakeUnique<BufferedOutputStream>( - MakeUnique<FileOutputStream>(vdex_files[i].GetFile()))); + std::unique_ptr<BufferedOutputStream> vdex_out = + std::make_unique<BufferedOutputStream>( + std::make_unique<FileOutputStream>(vdex_files[i].GetFile())); oat_writers[i]->WriteVerifierDeps(vdex_out.get(), nullptr); oat_writers[i]->WriteChecksumsAndVdexHeader(vdex_out.get()); } @@ -311,6 +313,7 @@ inline void CompilationHelper::Compile(CompilerDriver* driver, elf_writer->PrepareDynamicSection(rodata_size, text_size, oat_writer->GetBssSize(), + oat_writer->GetBssMethodsOffset(), oat_writer->GetBssRootsOffset()); writer->UpdateOatFileLayout(i, |