diff options
Diffstat (limited to 'test')
7 files changed, 184 insertions, 0 deletions
diff --git a/test/588-checker-irreducible-lifetime-hole/expected.txt b/test/588-checker-irreducible-lifetime-hole/expected.txt new file mode 100644 index 0000000000..d81cc0710e --- /dev/null +++ b/test/588-checker-irreducible-lifetime-hole/expected.txt @@ -0,0 +1 @@ +42 diff --git a/test/588-checker-irreducible-lifetime-hole/info.txt b/test/588-checker-irreducible-lifetime-hole/info.txt new file mode 100644 index 0000000000..a2861a9fd5 --- /dev/null +++ b/test/588-checker-irreducible-lifetime-hole/info.txt @@ -0,0 +1,3 @@ +Regression test for optimizing that used to have a too +strong DCHECK in the presence of a combination of irreducible loops +and try/catch. diff --git a/test/588-checker-irreducible-lifetime-hole/smali/IrreducibleLoop.smali b/test/588-checker-irreducible-lifetime-hole/smali/IrreducibleLoop.smali new file mode 100644 index 0000000000..207c77ef55 --- /dev/null +++ b/test/588-checker-irreducible-lifetime-hole/smali/IrreducibleLoop.smali @@ -0,0 +1,71 @@ +# Copyright (C) 2016 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 LIrreducibleLoop; + +.super Ljava/lang/Object; + +## CHECK-START-X86: int IrreducibleLoop.simpleLoop(int) dead_code_elimination (before) +## CHECK-DAG: <<Method:(i|j)\d+>> CurrentMethod +## CHECK-DAG: <<Constant:i\d+>> IntConstant 42 +## CHECK-DAG: Goto irreducible:true +## CHECK-DAG: InvokeStaticOrDirect [<<Constant>>,<<Method>>] loop:none +## CHECK-DAG: InvokeStaticOrDirect [{{i\d+}},<<Method>>] loop:none +.method public static simpleLoop(I)I + .registers 3 + const/16 v0, 42 + invoke-static {v0}, LIrreducibleLoop;->$noinline$m(I)V + if-eqz p0, :b22 + goto :b34 + + :b34 + goto :b20 + + :b20 + if-nez p0, :b45 + goto :b46 + + :b46 + goto :b21 + + :b21 + goto :b34 + + :b22 + :try_start + div-int v0, v0, v0 + :try_end + .catchall {:try_start .. :try_end} :b34 + goto :b20 + + :b45 + invoke-static {v0}, LIrreducibleLoop;->$noinline$m(I)V + goto :b26 + + :b26 + return v0 +.end method + +.method public static $noinline$m(I)V + .registers 3 + const/16 v0, 0 + sget-boolean v1,LIrreducibleLoop;->doThrow:Z + if-eqz v1, :exit + # Prevent inlining. + throw v0 + :exit + return-void +.end method + +.field public static doThrow:Z diff --git a/test/588-checker-irreducible-lifetime-hole/src/Main.java b/test/588-checker-irreducible-lifetime-hole/src/Main.java new file mode 100644 index 0000000000..94e3357e5d --- /dev/null +++ b/test/588-checker-irreducible-lifetime-hole/src/Main.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2016 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 { + // Workaround for b/18051191. + class InnerClass {} + + public static void main(String[] args) throws Exception { + Class<?> c = Class.forName("IrreducibleLoop"); + Method m = c.getMethod("simpleLoop", int.class); + Object[] arguments = { 42 }; + System.out.println(m.invoke(null, arguments)); + } +} diff --git a/test/590-checker-array-set-null-regression/expected.txt b/test/590-checker-array-set-null-regression/expected.txt new file mode 100644 index 0000000000..b0aad4deb5 --- /dev/null +++ b/test/590-checker-array-set-null-regression/expected.txt @@ -0,0 +1 @@ +passed diff --git a/test/590-checker-array-set-null-regression/info.txt b/test/590-checker-array-set-null-regression/info.txt new file mode 100644 index 0000000000..fe173a334d --- /dev/null +++ b/test/590-checker-array-set-null-regression/info.txt @@ -0,0 +1,11 @@ +Regression test for art::PrepareForRegisterAllocation, which replaces + + ArraySet[array, index, BoundType[NullConstant]] + +with + + ArraySet[array, index, NullConstant] + +but used to forget to remove the "need for a type check" bit in the +ArraySet, thus failing "!may_need_runtime_call_for_type_check" +assertions in code generators. diff --git a/test/590-checker-array-set-null-regression/src/Main.java b/test/590-checker-array-set-null-regression/src/Main.java new file mode 100644 index 0000000000..792ee4ecd6 --- /dev/null +++ b/test/590-checker-array-set-null-regression/src/Main.java @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2016 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. + */ + +public class Main { + + public static void main(String args[]) { + Element[] elements = new Element[51]; + testArraySetCheckCastNull(elements); + + System.out.println("passed"); + } + + /// CHECK-START: void Main.testArraySetCheckCastNull(Main$Element[]) builder (after) + /// CHECK: <<Array:l\d+>> ParameterValue + /// CHECK-DAG: <<Index:i\d+>> IntConstant 42 + /// CHECK-DAG: <<Null:l\d+>> NullConstant + /// CHECK-DAG: <<Class:l\d+>> LoadClass + /// CHECK-DAG: CheckCast [<<Null>>,<<Class>>] + /// CHECK-DAG: <<CheckedValue:l\d+>> BoundType [<<Null>>] klass:Main$Element can_be_null:true + /// CHECK-DAG: <<CheckedArray:l\d+>> NullCheck [<<Array>>] + /// CHECK-DAG: <<Length:i\d+>> ArrayLength [<<CheckedArray>>] + /// CHECK-DAG: <<CheckedIndex:i\d+>> BoundsCheck [<<Index>>,<<Length>>] + /// CHECK-DAG: <<ArraySet:v\d+>> ArraySet [<<CheckedArray>>,<<CheckedIndex>>,<<CheckedValue>>] needs_type_check:true + + /// CHECK-START: void Main.testArraySetCheckCastNull(Main$Element[]) instruction_simplifier (after) + /// CHECK-NOT: CheckCast + + /// CHECK-START: void Main.testArraySetCheckCastNull(Main$Element[]) prepare_for_register_allocation (before) + /// CHECK: <<Array:l\d+>> ParameterValue + /// CHECK-DAG: <<Index:i\d+>> IntConstant 42 + /// CHECK-DAG: <<Null:l\d+>> NullConstant + /// CHECK-DAG: <<Class:l\d+>> LoadClass + /// CHECK-DAG: <<CheckedValue:l\d+>> BoundType [<<Null>>] + /// CHECK-DAG: <<CheckedArray:l\d+>> NullCheck [<<Array>>] + /// CHECK-DAG: <<Length:i\d+>> ArrayLength [<<CheckedArray>>] + /// CHECK-DAG: <<CheckedIndex:i\d+>> BoundsCheck [<<Index>>,<<Length>>] + /// CHECK-DAG: <<ArraySet:v\d+>> ArraySet [<<CheckedArray>>,<<CheckedIndex>>,<<CheckedValue>>] needs_type_check:true + + /// CHECK-START: void Main.testArraySetCheckCastNull(Main$Element[]) prepare_for_register_allocation (after) + /// CHECK: <<Array:l\d+>> ParameterValue + /// CHECK-DAG: <<Index:i\d+>> IntConstant 42 + /// CHECK-DAG: <<Null:l\d+>> NullConstant + /// CHECK-DAG: <<Class:l\d+>> LoadClass + /// CHECK-DAG: <<Length:i\d+>> ArrayLength [<<Array>>] + /// CHECK-DAG: <<ArraySet:v\d+>> ArraySet [<<Array>>,<<Index>>,<<Null>>] needs_type_check:false + + static void testArraySetCheckCastNull(Element[] elements) { + Object object = null; + Element element = (Element) object; + elements[42] = element; + } + + class Element {} + +} |