diff options
author | 2016-11-03 10:52:49 +0000 | |
---|---|---|
committer | 2016-11-03 12:55:11 +0000 | |
commit | 6bb7f1b60f4b6b2214457d19d66d2b7b50685feb (patch) | |
tree | 980f8d69174155e71469e4c5163e2dcf4d2c6fbe /compiler/oat_test.cc | |
parent | 63f41f9ff6ce6b68b93feafcbed0f75e5c439594 (diff) |
Integrate VerifierDeps in compiler driver.
If a VerifierDeps is given, try fast verify. Otherwise create
a new VerifierDeps and do the full verification.
test: test-art-host, verifier_deps_test
bug: 30937355
Change-Id: Ifb030d7b5232c95872164f601057a56ab96038e1
Diffstat (limited to 'compiler/oat_test.cc')
-rw-r--r-- | compiler/oat_test.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/compiler/oat_test.cc b/compiler/oat_test.cc index 64ee574889..102637f01b 100644 --- a/compiler/oat_test.cc +++ b/compiler/oat_test.cc @@ -377,7 +377,8 @@ TEST_F(OatTest, WriteRead) { if (kCompile) { TimingLogger timings2("OatTest::WriteRead", false, false); compiler_driver_->SetDexFilesForOatFile(class_linker->GetBootClassPath()); - compiler_driver_->CompileAll(class_loader, class_linker->GetBootClassPath(), &timings2); + compiler_driver_->CompileAll( + class_loader, class_linker->GetBootClassPath(), /* verifier_deps */ nullptr, &timings2); } ScratchFile tmp_oat, tmp_vdex(tmp_oat, ".vdex"); @@ -391,7 +392,8 @@ TEST_F(OatTest, WriteRead) { ASSERT_TRUE(success); if (kCompile) { // OatWriter strips the code, regenerate to compare - compiler_driver_->CompileAll(class_loader, class_linker->GetBootClassPath(), &timings); + compiler_driver_->CompileAll( + class_loader, class_linker->GetBootClassPath(), /* verifier_deps */ nullptr, &timings); } std::unique_ptr<OatFile> oat_file(OatFile::Open(tmp_oat.GetFilename(), tmp_oat.GetFilename(), @@ -515,7 +517,7 @@ TEST_F(OatTest, EmptyTextSection) { soa.Decode<mirror::ClassLoader>(class_loader).Ptr()); } compiler_driver_->SetDexFilesForOatFile(dex_files); - compiler_driver_->CompileAll(class_loader, dex_files, &timings); + compiler_driver_->CompileAll(class_loader, dex_files, /* verifier_deps */ nullptr, &timings); ScratchFile tmp_oat, tmp_vdex(tmp_oat, ".vdex"); SafeMap<std::string, std::string> key_value_store; |