From 39d4df62d4e2606073d05cc363370db825ad7b9f Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 7 May 2021 12:22:47 +0000 Subject: Revert "Devirtualize to HInvokeStaticOrDirect." This reverts commit 5024ddfd125b5c3b59d7f359ae33cf7f0255b048. Bug: 187408838 Reason for revert: b/187408838 Change-Id: If74f5ddbacc73296f66c55762e2a8d1ec2cd1f19 --- test/609-checker-inline-interface/src/Main.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (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 index 07709ea216..249b7781f0 100644 --- a/test/609-checker-inline-interface/src/Main.java +++ b/test/609-checker-inline-interface/src/Main.java @@ -32,7 +32,7 @@ public final class Main implements Interface { // Expected } try { - testInterfaceToDirectCall(); + testInterfaceToVirtualCall(); } catch (Error e) { // Expected. } @@ -53,19 +53,19 @@ public final class Main implements Interface { methodWithInvokeInterface(itf); } - /// CHECK-START: void Main.testInterfaceToDirectCall() inliner (before) + /// CHECK-START: void Main.testInterfaceToVirtualCall() inliner (before) /// CHECK: InvokeStaticOrDirect method_name:Main.methodWithInvokeInterface - /// CHECK-START: void Main.testInterfaceToDirectCall() inliner (before) + /// CHECK-START: void Main.testInterfaceToVirtualCall() inliner (before) /// CHECK-NOT: InvokeInterface - /// CHECK-START: void Main.testInterfaceToDirectCall() inliner (after) - /// CHECK: InvokeStaticOrDirect method_name:Main.doCall + /// CHECK-START: void Main.testInterfaceToVirtualCall() inliner (after) + /// CHECK: InvokeVirtual method_name:Main.doCall - /// CHECK-START: void Main.testInterfaceToDirectCall() inliner (after) - /// CHECK-NOT: InvokeVirtual + /// CHECK-START: void Main.testInterfaceToVirtualCall() inliner (after) + /// CHECK-NOT: InvokeStaticOrDirect /// CHECK-NOT: InvokeInterface - public static void testInterfaceToDirectCall() { + public static void testInterfaceToVirtualCall() { methodWithInvokeInterface(m); } -- cgit v1.2.3-59-g8ed1b