summaryrefslogtreecommitdiff
path: root/compiler/image_test.h
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2017-07-19 16:55:04 -0700
committer Mathieu Chartier <mathieuc@google.com> 2017-07-20 09:36:26 -0700
commite01b6f674a865a3aef7d66cd91a2d2e226587b50 (patch)
tree1d99c6889746d829a86b375b3d88552f29461b7e /compiler/image_test.h
parente8f48da635c4d07bbe431e5819da8e1fad91a8ef (diff)
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
Diffstat (limited to 'compiler/image_test.h')
-rw-r--r--compiler/image_test.h7
1 files changed, 4 insertions, 3 deletions
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()));
}