From 2e8fb0e5de97a42885be6a39ddddeb1541140085 Mon Sep 17 00:00:00 2001
From: Michael Haupt <mhaupt@openjdk.org>
Date: Tue, 14 Apr 2015 18:26:01 +0300
Subject: [PATCH] 8033465: JSR292: InvokerBytecodeGenerator: convert a check
 for REF_invokeVirtual on an interface into an assert

Reviewed-by: vlivanov
---
 .../classes/java/lang/invoke/InvokerBytecodeGenerator.java  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
index a29eed9417a..1cf7e85f6dc 100644
--- a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
@@ -847,11 +847,7 @@ class InvokerBytecodeGenerator {
             refKind = REF_invokeVirtual;
         }
 
-        if (member.getDeclaringClass().isInterface() && refKind == REF_invokeVirtual) {
-            // Methods from Object declared in an interface can be resolved by JVM to invokevirtual kind.
-            // Need to convert it back to invokeinterface to pass verification and make the invocation works as expected.
-            refKind = REF_invokeInterface;
-        }
+        assert(!(member.getDeclaringClass().isInterface() && refKind == REF_invokeVirtual));
 
         // push arguments
         emitPushArguments(name);