From 19dc255bf94a4229de8627a2079ee6f0e9005e2d Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 6 Jul 2016 14:01:50 +0000 Subject: Revert "Inline and optimize interface calls." Went ahead too quickly. This reverts commit d9faceaa8da92f4a56c2907de949081bd42faf79. Change-Id: I1610deaf89b38037cf2786d135a59c48b10ced0c --- test/609-checker-inline-interface/src/Main.java | 70 ------------------------- 1 file changed, 70 deletions(-) delete mode 100644 test/609-checker-inline-interface/src/Main.java (limited to 'test/609-checker-inline-interface/src/Main.java') diff --git a/test/609-checker-inline-interface/src/Main.java b/test/609-checker-inline-interface/src/Main.java deleted file mode 100644 index e9b3e87881..0000000000 --- a/test/609-checker-inline-interface/src/Main.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * 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 final class Main implements Interface { - - static void methodWithInvokeInterface(Interface interf) { - interf.$noinline$doCall(); - } - - public void $noinline$doCall() { - if (doThrow) throw new Error(""); - } - - public static void main(String[] args) { - testInlineInterfaceCall(); - testInterfaceToVirtualCall(); - } - - /// CHECK-START: void Main.testInlineInterfaceCall() inliner (before) - /// CHECK: InvokeStaticOrDirect method_name:Main.methodWithInvokeInterface - - /// CHECK-START: void Main.testInlineInterfaceCall() inliner (before) - /// CHECK-NOT: InvokeInterface - - /// CHECK-START: void Main.testInlineInterfaceCall() inliner (after) - /// CHECK: InvokeInterface method_name:Interface.$noinline$doCall - - /// CHECK-START: void Main.testInlineInterfaceCall() inliner (after) - /// CHECK-NOT: InvokeStaticOrDirect - public static void testInlineInterfaceCall() { - methodWithInvokeInterface(itf); - } - - /// CHECK-START: void Main.testInterfaceToVirtualCall() inliner (before) - /// CHECK: InvokeStaticOrDirect method_name:Main.methodWithInvokeInterface - - /// CHECK-START: void Main.testInterfaceToVirtualCall() inliner (before) - /// CHECK-NOT: InvokeInterface - - /// CHECK-START: void Main.testInterfaceToVirtualCall() inliner (after) - /// CHECK: InvokeVirtual method_name:Main.$noinline$doCall - - /// CHECK-START: void Main.testInterfaceToVirtualCall() inliner (after) - /// CHECK-NOT: InvokeStaticOrDirect - /// CHECK-NOT: InvokeInterface - public static void testInterfaceToVirtualCall() { - methodWithInvokeInterface(m); - } - - static Interface itf = new Main(); - static Main m = new Main(); - static boolean doThrow = false; -} - -interface Interface { - public void $noinline$doCall(); -} -- cgit v1.2.3-59-g8ed1b