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
diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc
index 22720ce..e8e1d40 100644
--- a/compiler/common_compiler_test.cc
+++ b/compiler/common_compiler_test.cc
@@ -196,6 +196,7 @@
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 @@
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) {