From 551b5e50c6ba047d3c2f115850f6aa60e34f5a5e Mon Sep 17 00:00:00 2001
From: Robert Field <rfield@openjdk.org>
Date: Thu, 3 Oct 2013 10:23:48 -0700
Subject: [PATCH] 8010433: Remove lambda metafactory work-around to JDK-8005119

Restore invokespecial to lambda metafactory

Reviewed-by: ksrini
---
 .../lang/invoke/AbstractValidatingLambdaMetafactory.java     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/jdk/src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java b/jdk/src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java
index 92a44a048f3..793a2d13f01 100644
--- a/jdk/src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java
+++ b/jdk/src/share/classes/java/lang/invoke/AbstractValidatingLambdaMetafactory.java
@@ -125,10 +125,7 @@ import static sun.invoke.util.Wrapper.isWrapperType;
 
         this.implMethod = implMethod;
         this.implInfo = caller.revealDirect(implMethod);
-        // @@@ Temporary work-around pending resolution of 8005119
-        this.implKind = (implInfo.getReferenceKind() == MethodHandleInfo.REF_invokeSpecial)
-                        ? MethodHandleInfo.REF_invokeVirtual
-                        : implInfo.getReferenceKind();
+        this.implKind = implInfo.getReferenceKind();
         this.implIsInstanceMethod =
                 implKind == MethodHandleInfo.REF_invokeVirtual ||
                 implKind == MethodHandleInfo.REF_invokeSpecial ||