commit 00916b9eb0d83f333a00d7c8b839a62aed967857
author Vladimir Marko <vmarko@google.com> Wed May 17 17:45:45 2017 +0100
committer Vladimir Marko <vmarko@google.com> Wed May 17 18:06:02 2017 +0100
tree 2fe301ea898918e550f971fc2f164cf4ab3768a5
parent 2fad527ddf2b8d85df82468932ed724407f46be8

X86: Fix LoadString/Class for non-PIC boot image.

Do not check for PIC/non-PIC mode when recording patches.
This was erroneously missed in
    https://android-review.googlesource.com/397193
and broke 916-obsolete-jit for no-image as it actually
tries to compile the boot image in non-PIC mode.

Test: testrunner.py --host --no-image -t 916-obsolete-jit
Bug: 33192586
Change-Id: I068fbaa576635ea4f7d49521df55c98ba99dd34e

compiler/optimizing/code_generator_x86.cc

diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index aceeefb..4a279d8 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -4633,12 +4633,7 @@
 
 void CodeGeneratorX86::RecordBootStringPatch(HLoadString* load_string) {
   DCHECK(GetCompilerOptions().IsBootImage());
-  HX86ComputeBaseMethodAddress* address = nullptr;
-  if (GetCompilerOptions().GetCompilePic()) {
-    address = load_string->InputAt(0)->AsX86ComputeBaseMethodAddress();
-  } else {
-    DCHECK_EQ(load_string->InputCount(), 0u);
-  }
+  HX86ComputeBaseMethodAddress* address = load_string->InputAt(0)->AsX86ComputeBaseMethodAddress();
   string_patches_.emplace_back(address,
                                load_string->GetDexFile(),
                                load_string->GetStringIndex().index_);
@@ -4646,12 +4641,7 @@
 }
 
 void CodeGeneratorX86::RecordBootTypePatch(HLoadClass* load_class) {
-  HX86ComputeBaseMethodAddress* address = nullptr;
-  if (GetCompilerOptions().GetCompilePic()) {
-    address = load_class->InputAt(0)->AsX86ComputeBaseMethodAddress();
-  } else {
-    DCHECK_EQ(load_class->InputCount(), 0u);
-  }
+  HX86ComputeBaseMethodAddress* address = load_class->InputAt(0)->AsX86ComputeBaseMethodAddress();
   boot_image_type_patches_.emplace_back(address,
                                         load_class->GetDexFile(),
                                         load_class->GetTypeIndex().index_);