ART-tests: Remove DX dependency from 450-checker-types.
Test: art/test.py -r --host -t 450
Change-Id: I6f319c7b9d8f2c72f9c739890acd6499f7ffcacd
diff --git a/test/450-checker-types/build b/test/450-checker-types/build
index 3721955..49292c9 100755
--- a/test/450-checker-types/build
+++ b/test/450-checker-types/build
@@ -20,7 +20,4 @@
# Also disable desugar because it is missing in jack platform builds.
export DESUGAR=false
-# See b/65168732
-export USE_D8=false
-
./default-build "$@"
diff --git a/test/450-checker-types/smali/Main2.smali b/test/450-checker-types/smali/Main2.smali
new file mode 100644
index 0000000..5f11be3
--- /dev/null
+++ b/test/450-checker-types/smali/Main2.smali
@@ -0,0 +1,55 @@
+# Copyright 2018 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.
+
+.class LMain2;
+.super Ljava/lang/Object;
+.source "Main2.java"
+
+
+# direct methods
+.method constructor <init>()V
+ .registers 1
+
+ .prologue
+ .line 17
+ invoke-direct {p0}, Ljava/lang/Object;-><init>()V
+
+ return-void
+.end method
+
+## CHECK-START: void Main2.testArraySimpleRemove() instruction_simplifier (before)
+## CHECK: CheckCast
+
+## CHECK-START: void Main2.testArraySimpleRemove() instruction_simplifier (after)
+## CHECK-NOT: CheckCast
+
+.method static testArraySimpleRemove()V
+ .registers 3
+
+ .prologue
+ .line 19
+ const/16 v2, 0xa
+
+ new-array v0, v2, [LSubclassA;
+
+ .local v0, "b":[LSuper;
+ move-object v1, v0
+
+ .line 20
+ check-cast v1, [LSubclassA;
+
+ .line 21
+ .local v1, "c":[LSubclassA;
+ return-void
+.end method
diff --git a/test/450-checker-types/src/Main.java b/test/450-checker-types/src/Main.java
index ae0fdbe..f6561cd 100644
--- a/test/450-checker-types/src/Main.java
+++ b/test/450-checker-types/src/Main.java
@@ -463,16 +463,6 @@
public SubclassA $noinline$getSubclass() { throw new RuntimeException(); }
- /// CHECK-START: void Main.testArraySimpleRemove() instruction_simplifier (before)
- /// CHECK: CheckCast
-
- /// CHECK-START: void Main.testArraySimpleRemove() instruction_simplifier (after)
- /// CHECK-NOT: CheckCast
- public void testArraySimpleRemove() {
- Super[] b = new SubclassA[10];
- SubclassA[] c = (SubclassA[])b;
- }
-
/// CHECK-START: void Main.testInvokeSimpleRemove() instruction_simplifier (before)
/// CHECK: CheckCast
