commit 213f857ab772e32baaaac378551e2ddf1e2c151c
author Alan Leung <acleung@google.com> Fri Sep 08 14:44:24 2017 -0700
committer Alan Leung <acleung@google.com> Mon Oct 16 23:59:02 2017 -0700
tree 8c091e70ec1d1923bdf9d8bba400c4b69441aef3
parent ea7638349dd23dfdd6ee0c2e45a63faa653962e3

Make checker-null-array-get less dexer sensitive.

Bug: 65168732
Test: art/test/run-test ... 586-checker-null-array-get
Change-Id: Icc4f9e899e494aa0db11a10e7570d496c256e356

test/586-checker-null-array-get/src/Main.java

diff --git a/test/586-checker-null-array-get/src/Main.java b/test/586-checker-null-array-get/src/Main.java
index 09ebff1..de9429f 100644
--- a/test/586-checker-null-array-get/src/Main.java
+++ b/test/586-checker-null-array-get/src/Main.java
@@ -65,6 +65,14 @@
     } catch (Throwable t) {
       throw new Error("Unexpected Throwable", t);
     }
+    try {
+      $noinline$runSmaliTest("bar2");
+      throw new Error("Expected NullPointerException");
+    } catch (NullPointerException e) {
+      // Expected.
+    } catch (Throwable t) {
+      throw new Error("Unexpected Throwable", t);
+    }
 
     try {
       test1();
@@ -86,9 +94,8 @@
 
   /// CHECK-START: void Main.bar() load_store_elimination (after)
   /// CHECK-DAG: <<Null:l\d+>>       NullConstant
-  /// CHECK-DAG: <<BoundFirst:l\d+>> BoundType [<<Null>>]
-  /// CHECK-DAG: <<BoundType:l\d+>>  BoundType [<<BoundFirst>>]
-  /// CHECK-DAG: <<CheckL:l\d+>>     NullCheck [<<BoundType>>]
+  /// CHECK-DAG:                     BoundType [<<Null>>]
+  /// CHECK-DAG: <<CheckL:l\d+>>     NullCheck
   /// CHECK-DAG: <<GetL0:l\d+>>      ArrayGet [<<CheckL>>,{{i\d+}}]
   /// CHECK-DAG: <<GetL1:l\d+>>      ArrayGet [<<CheckL>>,{{i\d+}}]
   /// CHECK-DAG: <<GetL2:l\d+>>      ArrayGet [<<CheckL>>,{{i\d+}}]