commit 6c42676b466c4f08cfa6ca43da65bc74f48dc063
author Vladimir Marko <vmarko@google.com> Fri Oct 21 12:27:16 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 21 12:27:17 2016 +0000
tree 969ba7fdc4ca5902e31afa6252ee6649ae07fe9a
parent d681d9b1060e660b39de1286c336b5e38870a799
parent b55fdbb30b3bc4e334c241153b98c0a6ea4a4a2b

Merge "Disable kBssEntry LoadString sharpening."

compiler/optimizing/sharpening.cc

diff --git a/compiler/optimizing/sharpening.cc b/compiler/optimizing/sharpening.cc
index c1cfe8d..df1b351 100644
--- a/compiler/optimizing/sharpening.cc
+++ b/compiler/optimizing/sharpening.cc
@@ -312,7 +312,8 @@
         desired_load_kind = HLoadString::LoadKind::kBootImageAddress;
         address = reinterpret_cast64<uint64_t>(string);
       } else {
-        desired_load_kind = HLoadString::LoadKind::kBssEntry;
+        // FIXME: Disabled because of BSS root visiting issues. Bug: 32124939
+        // desired_load_kind = HLoadString::LoadKind::kBssEntry;
       }
     }
   }

test/552-checker-sharpening/src/Main.java

diff --git a/test/552-checker-sharpening/src/Main.java b/test/552-checker-sharpening/src/Main.java
index 3c053cf..ff6ccd4 100644
--- a/test/552-checker-sharpening/src/Main.java
+++ b/test/552-checker-sharpening/src/Main.java
@@ -284,28 +284,29 @@
   /// CHECK-START: java.lang.String Main.$noinline$getNonBootImageString() sharpening (before)
   /// CHECK:                LoadString load_kind:DexCacheViaMethod
 
-  /// CHECK-START-X86: java.lang.String Main.$noinline$getNonBootImageString() sharpening (after)
-  /// CHECK:                LoadString load_kind:BssEntry
+  // FIXME: Disabled because of BSS root visiting issues. Bug: 32124939
+  // CHECK-START-X86: java.lang.String Main.$noinline$getNonBootImageString() sharpening (after)
+  // CHECK:                LoadString load_kind:BssEntry
 
-  /// CHECK-START-X86: java.lang.String Main.$noinline$getNonBootImageString() pc_relative_fixups_x86 (after)
-  /// CHECK-DAG:            X86ComputeBaseMethodAddress
-  /// CHECK-DAG:            LoadString load_kind:BssEntry
+  // CHECK-START-X86: java.lang.String Main.$noinline$getNonBootImageString() pc_relative_fixups_x86 (after)
+  // CHECK-DAG:            X86ComputeBaseMethodAddress
+  // CHECK-DAG:            LoadString load_kind:BssEntry
 
-  /// CHECK-START-X86_64: java.lang.String Main.$noinline$getNonBootImageString() sharpening (after)
-  /// CHECK:                LoadString load_kind:BssEntry
+  // CHECK-START-X86_64: java.lang.String Main.$noinline$getNonBootImageString() sharpening (after)
+  // CHECK:                LoadString load_kind:BssEntry
 
-  /// CHECK-START-ARM: java.lang.String Main.$noinline$getNonBootImageString() sharpening (after)
-  /// CHECK:                LoadString load_kind:BssEntry
+  // CHECK-START-ARM: java.lang.String Main.$noinline$getNonBootImageString() sharpening (after)
+  // CHECK:                LoadString load_kind:BssEntry
 
-  /// CHECK-START-ARM64: java.lang.String Main.$noinline$getNonBootImageString() sharpening (after)
-  /// CHECK:                LoadString load_kind:BssEntry
+  // CHECK-START-ARM64: java.lang.String Main.$noinline$getNonBootImageString() sharpening (after)
+  // CHECK:                LoadString load_kind:BssEntry
 
-  /// CHECK-START-MIPS: java.lang.String Main.$noinline$getNonBootImageString() sharpening (after)
-  /// CHECK:                LoadString load_kind:BssEntry
+  // CHECK-START-MIPS: java.lang.String Main.$noinline$getNonBootImageString() sharpening (after)
+  // CHECK:                LoadString load_kind:BssEntry
 
-  /// CHECK-START-MIPS: java.lang.String Main.$noinline$getNonBootImageString() pc_relative_fixups_mips (after)
-  /// CHECK-DAG:            MipsComputeBaseMethodAddress
-  /// CHECK-DAG:            LoadString load_kind:BssEntry
+  // CHECK-START-MIPS: java.lang.String Main.$noinline$getNonBootImageString() pc_relative_fixups_mips (after)
+  // CHECK-DAG:            MipsComputeBaseMethodAddress
+  // CHECK-DAG:            LoadString load_kind:BssEntry
 
   public static String $noinline$getNonBootImageString() {
     // Prevent inlining to avoid the string comparison being optimized away.