From 6bb7f1b60f4b6b2214457d19d66d2b7b50685feb Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 3 Nov 2016 10:52:49 +0000 Subject: 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 --- compiler/driver/compiler_driver.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'compiler/driver/compiler_driver.h') diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index 4a48f9c841..c8d6cb0d4d 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -50,6 +50,7 @@ class DexCache; namespace verifier { class MethodVerifier; +class VerifierDeps; class VerifierDepsTest; } // namespace verifier @@ -117,6 +118,7 @@ class CompilerDriver { void CompileAll(jobject class_loader, const std::vector& dex_files, + verifier::VerifierDeps* verifier_deps, TimingLogger* timings) REQUIRES(!Locks::mutator_lock_, !compiled_classes_lock_, !dex_to_dex_references_lock_); @@ -415,6 +417,7 @@ class CompilerDriver { private: void PreCompile(jobject class_loader, const std::vector& dex_files, + verifier::VerifierDeps* verifier_deps, TimingLogger* timings) REQUIRES(!Locks::mutator_lock_, !compiled_classes_lock_); @@ -437,7 +440,9 @@ class CompilerDriver { void Verify(jobject class_loader, const std::vector& dex_files, + verifier::VerifierDeps* verifier_deps, TimingLogger* timings); + void VerifyDexFile(jobject class_loader, const DexFile& dex_file, const std::vector& dex_files, -- cgit v1.2.3-59-g8ed1b