diff options
author | 2019-12-13 11:51:58 +0000 | |
---|---|---|
committer | 2019-12-17 07:25:50 +0000 | |
commit | d03f8e63e6167af9148bc2ce374fd579e9a16202 (patch) | |
tree | 41ec26974d148b569566c9069806b548e5ce8c26 | |
parent | 0e01c8d3f3c2d7cc4ac2cf5cf01ae913a4c6181e (diff) |
Add a String.init range call.
Test that ART can compile / interpret a range call to String.init.
Test: 723-string-init-range
Change-Id: If0f9e68978aed91e8e5a9b6a135489cc7bd72120
-rw-r--r-- | test/723-string-init-range/expected.txt | 0 | ||||
-rw-r--r-- | test/723-string-init-range/info.txt | 1 | ||||
-rw-r--r-- | test/723-string-init-range/smali/new-instance.smali | 25 | ||||
-rw-r--r-- | test/723-string-init-range/src/Main.java | 30 | ||||
-rw-r--r-- | test/knownfailures.json | 1 |
5 files changed, 57 insertions, 0 deletions
diff --git a/test/723-string-init-range/expected.txt b/test/723-string-init-range/expected.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/test/723-string-init-range/expected.txt diff --git a/test/723-string-init-range/info.txt b/test/723-string-init-range/info.txt new file mode 100644 index 0000000000..20c370460f --- /dev/null +++ b/test/723-string-init-range/info.txt @@ -0,0 +1 @@ +Test for calling String.<init> with invoke-range. diff --git a/test/723-string-init-range/smali/new-instance.smali b/test/723-string-init-range/smali/new-instance.smali new file mode 100644 index 0000000000..45d6329e9c --- /dev/null +++ b/test/723-string-init-range/smali/new-instance.smali @@ -0,0 +1,25 @@ +# +# Copyright (C) 2019 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 public LNewInstance; +.super Ljava/lang/Object; + +.method public static initRange(Ljava/lang/String;)Ljava/lang/String; + .registers 2 + new-instance v0, Ljava/lang/String; + move-object v1, p0 + invoke-direct/range {v0 .. v1}, Ljava/lang/String;-><init>(Ljava/lang/String;)V + return-object v0 +.end method diff --git a/test/723-string-init-range/src/Main.java b/test/723-string-init-range/src/Main.java new file mode 100644 index 0000000000..97ba76daa6 --- /dev/null +++ b/test/723-string-init-range/src/Main.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2019 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. + */ + +import java.lang.reflect.Method; + +public class Main { + + static String expected = "Hello"; + public static void main(String args[]) throws Throwable { + Class<?> c = Class.forName("NewInstance"); + Method m = c.getMethod("initRange", String.class); + String result = (String)m.invoke(null, expected); + if (!expected.equals(result)) { + throw new Error("Expected '" + expected + "', got " + result); + } + } +} diff --git a/test/knownfailures.json b/test/knownfailures.json index 2e2d7f749d..02705bccb8 100644 --- a/test/knownfailures.json +++ b/test/knownfailures.json @@ -1119,6 +1119,7 @@ "691-hiddenapi-proxy", "692-vdex-inmem-loader", "693-vdex-inmem-loader-evict", + "723-string-init-range", "999-redefine-hiddenapi", "1000-non-moving-space-stress", "1001-app-image-regions", |