From e01b6f674a865a3aef7d66cd91a2d2e226587b50 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 19 Jul 2017 16:55:04 -0700 Subject: Move IsVeryLarge check before we create verification results Otherwise we can end up creating verification results when they are not actually needed (if the compiler filter was >= quicken). Bug: 63467744 Test: test-art-host Change-Id: Ied2a12e0e4c2010f3f660e278c3a5111545ba251 --- compiler/dex/quick_compiler_callbacks.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 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 2100522f10..a3a6c0972c 100644 --- a/compiler/dex/quick_compiler_callbacks.h +++ b/compiler/dex/quick_compiler_callbacks.h @@ -26,11 +26,8 @@ class VerificationResults; class QuickCompilerCallbacks FINAL : public CompilerCallbacks { public: - QuickCompilerCallbacks(VerificationResults* verification_results, - CompilerCallbacks::CallbackMode mode) - : CompilerCallbacks(mode), - verification_results_(verification_results), - verifier_deps_(nullptr) {} + explicit QuickCompilerCallbacks(CompilerCallbacks::CallbackMode mode) + : CompilerCallbacks(mode) {} ~QuickCompilerCallbacks() { } @@ -52,8 +49,12 @@ class QuickCompilerCallbacks FINAL : public CompilerCallbacks { verifier_deps_.reset(deps); } + void SetVerificationResults(VerificationResults* verification_results) { + verification_results_ = verification_results; + } + private: - VerificationResults* const verification_results_; + VerificationResults* verification_results_ = nullptr; std::unique_ptr verifier_deps_; }; -- cgit v1.2.3-59-g8ed1b