summaryrefslogtreecommitdiff
path: root/compiler/common_compiler_test.cc
diff options
context:
space:
mode:
authorVladimir Marko <vmarko@google.com>2018-06-28 17:30:16 +0100
committerVladimir Marko <vmarko@google.com>2018-06-28 17:55:01 +0100
commitbb089b6bf850c87e0e42917a383cc7298dcb09c5 (patch)
tree9076775ab1a00bf7321a6b4a457ddd81f20c10c1 /compiler/common_compiler_test.cc
parentb5271dd44a30f498689e503340d3c8d01bf31f07 (diff)
Remove CompilerDriver::support_boot_image_fixup_.
Check for non-PIC boot image as a testing config instead. Honor the config for HInvokeStaticOrDirect sharpening. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Change-Id: I3645f4fefe322f1fd64ea88a2b41a35ceccea688
Diffstat (limited to 'compiler/common_compiler_test.cc')
-rw-r--r--compiler/common_compiler_test.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc
index 22720ce524..e8e1d408ef 100644
--- a/compiler/common_compiler_test.cc
+++ b/compiler/common_compiler_test.cc
@@ -196,6 +196,7 @@ void CommonCompilerTest::CreateCompilerDriver() {
ApplyInstructionSet();
compiler_options_->boot_image_ = true;
+ compiler_options_->compile_pic_ = false; // Non-PIC boot image is a test configuration.
compiler_options_->SetCompilerFilter(GetCompilerFilter());
compiler_options_->image_classes_.swap(*GetImageClasses());
compiler_driver_.reset(new CompilerDriver(compiler_options_.get(),
@@ -205,8 +206,6 @@ void CommonCompilerTest::CreateCompilerDriver() {
number_of_threads_,
/* swap_fd */ -1,
GetProfileCompilationInfo()));
- // We typically don't generate an image in unit tests, disable this optimization by default.
- compiler_driver_->SetSupportBootImageFixup(false);
}
void CommonCompilerTest::SetUpRuntimeOptions(RuntimeOptions* options) {