From f508c565b13585a766719b87a00e3c2a4200abe0 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Thu, 1 Sep 2016 15:33:04 +0000 Subject: [PATCH] Revert "Re-enable boot image string sharpening." The boot image may not contain the target String. Bug: 20323084 Bug: 31239436 This reverts commit 9ed010e43c729a801089307c55f20f6d4df8271c. Change-Id: Id299619ff9866bacd5098f76836355878a478042 --- compiler/optimizing/sharpening.cc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/compiler/optimizing/sharpening.cc b/compiler/optimizing/sharpening.cc index 40fff8af3..6effc306d 100644 --- a/compiler/optimizing/sharpening.cc +++ b/compiler/optimizing/sharpening.cc @@ -295,15 +295,7 @@ void HSharpening::ProcessLoadString(HLoadString* load_string) { DCHECK(!runtime->UseJitCompilation()); mirror::String* string = class_linker->ResolveString(dex_file, string_index, dex_cache); CHECK(string != nullptr); - if (compiler_driver_->GetSupportBootImageFixup()) { - DCHECK(ContainsElement(compiler_driver_->GetDexFilesForOatFile(), &dex_file)); - desired_load_kind = codegen_->GetCompilerOptions().GetCompilePic() - ? HLoadString::LoadKind::kBootImageLinkTimePcRelative - : HLoadString::LoadKind::kBootImageLinkTimeAddress; - } else { - // MIPS64 or compiler_driver_test. Do not sharpen. - DCHECK_EQ(desired_load_kind, HLoadString::LoadKind::kDexCacheViaMethod); - } + // TODO: In follow up CL, add PcRelative and Address back in. } else if (runtime->UseJitCompilation()) { // TODO: Make sure we don't set the "compile PIC" flag for JIT as that's bogus. // DCHECK(!codegen_->GetCompilerOptions().GetCompilePic()); -- 2.11.0