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/dex/quick_compiler_callbacks.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'compiler/dex/quick_compiler_callbacks.h') diff --git a/compiler/dex/quick_compiler_callbacks.h b/compiler/dex/quick_compiler_callbacks.h index 34fd88b498..db0fdaa72f 100644 --- a/compiler/dex/quick_compiler_callbacks.h +++ b/compiler/dex/quick_compiler_callbacks.h @@ -18,6 +18,7 @@ #define ART_COMPILER_DEX_QUICK_COMPILER_CALLBACKS_H_ #include "compiler_callbacks.h" +#include "verifier/verifier_deps.h" namespace art { @@ -46,16 +47,16 @@ class QuickCompilerCallbacks FINAL : public CompilerCallbacks { } verifier::VerifierDeps* GetVerifierDeps() const OVERRIDE { - return verifier_deps_; + return verifier_deps_.get(); } - void SetVerifierDeps(verifier::VerifierDeps* deps) { - verifier_deps_ = deps; + void SetVerifierDeps(verifier::VerifierDeps* deps) OVERRIDE { + verifier_deps_.reset(deps); } private: VerificationResults* const verification_results_; - verifier::VerifierDeps* verifier_deps_; + std::unique_ptr verifier_deps_; }; } // namespace art -- cgit v1.2.3-59-g8ed1b