From d48708dd87879d9e7855011b5913bf6ade502799 Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Thu, 8 Oct 2015 17:31:00 +0100 Subject: [PATCH] Add test to check that unverified methods are not inlined. Change-Id: I4b91d863d871be2419d9558b3d19c53cba4f6e2d --- .../537-checker-inline-and-unverified/expected.txt | 0 test/537-checker-inline-and-unverified/info.txt | 1 + .../src/Main.java | 59 ++++++++++++++++++++++ .../src/other/InaccessibleClass.java | 20 ++++++++ .../src2/other/InaccessibleClass.java | 20 ++++++++ 5 files changed, 100 insertions(+) create mode 100644 test/537-checker-inline-and-unverified/expected.txt create mode 100644 test/537-checker-inline-and-unverified/info.txt create mode 100644 test/537-checker-inline-and-unverified/src/Main.java create mode 100644 test/537-checker-inline-and-unverified/src/other/InaccessibleClass.java create mode 100644 test/537-checker-inline-and-unverified/src2/other/InaccessibleClass.java diff --git a/test/537-checker-inline-and-unverified/expected.txt b/test/537-checker-inline-and-unverified/expected.txt new file mode 100644 index 000000000..e69de29bb diff --git a/test/537-checker-inline-and-unverified/info.txt b/test/537-checker-inline-and-unverified/info.txt new file mode 100644 index 000000000..ec1232740 --- /dev/null +++ b/test/537-checker-inline-and-unverified/info.txt @@ -0,0 +1 @@ +Checks that unverified methods are not inlined. diff --git a/test/537-checker-inline-and-unverified/src/Main.java b/test/537-checker-inline-and-unverified/src/Main.java new file mode 100644 index 000000000..bdc14b027 --- /dev/null +++ b/test/537-checker-inline-and-unverified/src/Main.java @@ -0,0 +1,59 @@ +/* + * 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. + */ + +import other.InaccessibleClass; + +public class Main { + public static void main(String[] args) { + try { + testNoInline(); + } catch (IllegalAccessError e) { + // expected + } + testInline(); + } + + /// CHECK-START: void Main.testNoInline() inliner (before) + /// CHECK: InvokeStaticOrDirect method_name:Main.$opt$noinline$testNoInline + + /// CHECK-START: void Main.testNoInline() inliner (after) + /// CHECK: InvokeStaticOrDirect method_name:Main.$opt$noinline$testNoInline + public static void testNoInline() { + $opt$noinline$testNoInline(); + } + + /// CHECK-START: void Main.testInline() inliner (before) + /// CHECK: InvokeStaticOrDirect method_name:Main.$opt$inline$testInline + + /// CHECK-START: void Main.testInline() inliner (after) + /// CHECK-NOT: InvokeStaticOrDirect + public static void testInline() { + $opt$inline$testInline(); + } + + public static boolean $opt$noinline$testNoInline() { + try { + return null instanceof InaccessibleClass; + } catch (IllegalAccessError e) { + // expected + } + return false; + } + + public static boolean $opt$inline$testInline() { + return null instanceof Main; + } +} diff --git a/test/537-checker-inline-and-unverified/src/other/InaccessibleClass.java b/test/537-checker-inline-and-unverified/src/other/InaccessibleClass.java new file mode 100644 index 000000000..de2e1d783 --- /dev/null +++ b/test/537-checker-inline-and-unverified/src/other/InaccessibleClass.java @@ -0,0 +1,20 @@ +/* + * 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. + */ + +package other; + +public class InaccessibleClass { +} diff --git a/test/537-checker-inline-and-unverified/src2/other/InaccessibleClass.java b/test/537-checker-inline-and-unverified/src2/other/InaccessibleClass.java new file mode 100644 index 000000000..ff11d7adc --- /dev/null +++ b/test/537-checker-inline-and-unverified/src2/other/InaccessibleClass.java @@ -0,0 +1,20 @@ +/* + * 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. + */ + +package other; + +/* package */ class InaccessibleClass { +} -- 2.11.0