Fix run test 572-checker-array-get-regression on 32-bit archs.

HCurrentMethod instructions are typed as long on 64-bit
architectures, but as integer on 32-bit ones.

Bug: 26817006
Bug: 12687968
Change-Id: Icec2f0b0629c0af7a7afeabb0fd2881babb86368

diff --git a/test/572-checker-array-get-regression/src/Main.java b/test/572-checker-array-get-regression/src/Main.java
index bc13af9..1392215 100644 (file)
--- a/test/572-checker-array-get-regression/src/Main.java
+++ b/test/572-checker-array-get-regression/src/Main.java
@@ -21,7 +21,7 @@ public class Main {
   }
 
   /// CHECK-START: java.lang.Integer Main.test() ssa_builder (after)
-  /// CHECK-DAG:     <<Method:j\d+>>       CurrentMethod
+  /// CHECK-DAG:     <<Method:[ij]\d+>>    CurrentMethod
   /// CHECK-DAG:     <<Const2P20:i\d+>>    IntConstant 1048576
   /// CHECK-DAG:     <<ConstM1:i\d+>>      IntConstant -1
   /// CHECK-DAG:     <<Array:l\d+>>        NewArray [<<Const2P20>>,<<Method>>]
@@ -35,7 +35,7 @@ public class Main {
   /// CHECK-DAG:                           Return [<<LastElement>>]
 
   /// CHECK-START: java.lang.Integer Main.test() register (before)
-  /// CHECK-DAG:     <<Method:j\d+>>       CurrentMethod
+  /// CHECK-DAG:     <<Method:[ij]\d+>>    CurrentMethod
   /// CHECK-DAG:     <<Const2P20:i\d+>>    IntConstant 1048576
   /// CHECK-DAG:     <<Const2P20M1:i\d+>>  IntConstant 1048575
   /// CHECK-DAG:     <<Array:l\d+>>        NewArray [<<Const2P20>>,<<Method>>]