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/image_test.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'compiler/image_test.h') diff --git a/compiler/image_test.h b/compiler/image_test.h index fa714ada6c..6c3a89b7a2 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())); } -- cgit v1.2.3-59-g8ed1b