commit 51e52c0856cd44f0c324ab35e6658008d84bf3df
author Ian Zerny <zerny@google.com> Thu Sep 20 07:12:46 2018 +0000
committer Ian Zerny <zerny@google.com> Thu Sep 20 07:12:46 2018 +0000
tree 78d9050aad96f6a328123ad5689d2c01e422c0d3
parent 67e4f8faa93a5ef8ed3ed84708c8655182409b76

Revert "Use different operations to load string before loops in LICM test."

This reverts commit 67e4f8faa93a5ef8ed3ed84708c8655182409b76.

Reason for revert: This is an invalid optimization on D8's part and should not need ART test updates.

Change-Id: I948ad1c5d720e7236205ed1e728dbb5fbc378974

test/624-checker-stringops/src/Main.java

diff --git a/test/624-checker-stringops/src/Main.java b/test/624-checker-stringops/src/Main.java
index 4d98df8..3aa6e56 100644
--- a/test/624-checker-stringops/src/Main.java
+++ b/test/624-checker-stringops/src/Main.java
@@ -38,7 +38,7 @@
   /// CHECK-DAG: InvokeVirtual intrinsic:StringStringIndexOf      loop:none
   /// CHECK-DAG: InvokeVirtual intrinsic:StringStringIndexOfAfter loop:none
   static int liveIndexOf() {
-    int k = ABC.lastIndexOf('Z') + XYZ.lastIndexOf('Z');  // does LoadString before loops
+    int k = ABC.length() + XYZ.length();  // does LoadString before loops
     for (char c = 'A'; c <= 'Z'; c++) {
       k += ABC.indexOf(c);
     }
@@ -290,7 +290,7 @@
   }
 
   public static void main(String[] args) throws Exception {
-    expectEquals(1863, liveIndexOf());
+    expectEquals(1865, liveIndexOf());
     expectEquals(29, deadIndexOf());
 
     try {