commit 67e4f8faa93a5ef8ed3ed84708c8655182409b76
author Jinseong Jeon <jsjeon@google.com> Tue Sep 18 22:51:37 2018 -0700
committer Jinseong Jeon <jsjeon@google.com> Wed Sep 19 06:04:56 2018 +0000
tree f9dfcc01315c7d96f43fa8c63abcd8c5f18b9657
parent a93364cbd4ebf4b8c309c4c18f30e16c8f9a8997

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

The test assertion will not hold if a compiler (D8) removes the
string load, e.g., by computing String#length at compile time:
  https://r8-review.googlesource.com/c/r8/+/26540

Bug: 115968045
Bug: 113880427
Test: art/test.py --host -r -t 624-checker-stringops

Change-Id: Ibe6a4a46f534b7079ba516f27da82fec2d60f4ea

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 3aa6e56..4d98df8 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.length() + XYZ.length();  // does LoadString before loops
+    int k = ABC.lastIndexOf('Z') + XYZ.lastIndexOf('Z');  // 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(1865, liveIndexOf());
+    expectEquals(1863, liveIndexOf());
     expectEquals(29, deadIndexOf());
 
     try {