From bb089b6bf850c87e0e42917a383cc7298dcb09c5 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Thu, 28 Jun 2018 17:30:16 +0100 Subject: 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 --- compiler/common_compiler_test.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'compiler/common_compiler_test.cc') 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) { -- cgit v1.2.3-59-g8ed1b