ART: Remove old aget on null workaround
Use null for an aget-object of null. Ensure that other aget types
on null cannot be converted to or used as a reference type.
Let the verifier continue scanning after an aget on a null register,
to ensure that the dead code is type-safe.
Add test coverage for the new behavior.
Partially reverts commit 4824c27988c8eeb302791624bb3ce1d557b0db6c
Partially reverts commit 857f058d4b7bd07c5c99eda416ad91516a10b4da
Bug: 22059710
Bug: 64683522
Bug: 69669661
Test: m test-art-host
Change-Id: Ie0b554e8f880251d8e73ab6dfb6b41a5e63defc6
diff --git a/test/518-null-array-get/smali/NullArraySuccessShort.smali b/test/518-null-array-get/smali/NullArraySuccessShort.smali
new file mode 100644
index 0000000..d332e51
--- /dev/null
+++ b/test/518-null-array-get/smali/NullArraySuccessShort.smali
@@ -0,0 +1,33 @@
+# Copyright (C) 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Check that the result of aget-short on null can be used as a short.
+
+.class public LNullArraySuccessShort;
+
+.super Ljava/lang/Object;
+
+.method public static shortMethod(S)V
+ .registers 1
+ return-void
+.end method
+
+.method public static method()V
+ .registers 2
+ const/4 v0, 0
+ const/4 v1, 0
+ aget-short v0, v0, v1
+ invoke-static { v0 }, LNullArraySuccessShort;->shortMethod(S)V
+ return-void
+.end method