From d571ea407c1013edd6feeb45124e5127e4cbf281 Mon Sep 17 00:00:00 2001 From: Dmitry Chuyko Date: Tue, 19 Jun 2018 18:18:46 +0300 Subject: [PATCH] 8198719: MethodHandleHelper.linkToStatic should drop MH arg Reviewed-by: vlivanov, dlong --- .../jtreg/compiler/jsr292/InvokerSignatureMismatch.java | 2 +- .../java.base/java/lang/invoke/MethodHandleHelper.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/hotspot/jtreg/compiler/jsr292/InvokerSignatureMismatch.java b/test/hotspot/jtreg/compiler/jsr292/InvokerSignatureMismatch.java index dbd9e0101fc..188051025ad 100644 --- a/test/hotspot/jtreg/compiler/jsr292/InvokerSignatureMismatch.java +++ b/test/hotspot/jtreg/compiler/jsr292/InvokerSignatureMismatch.java @@ -39,7 +39,7 @@ public class InvokerSignatureMismatch { static void mainLink(int i) throws Throwable { Object name = MethodHandleHelper.internalMemberName(INT_MH); - MethodHandleHelper.linkToStatic(INT_MH, (float) i, name); + MethodHandleHelper.linkToStatic((float) i, name); } static void mainInvoke(int i) throws Throwable { diff --git a/test/hotspot/jtreg/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java b/test/hotspot/jtreg/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java index c7406282274..d5680420cc2 100644 --- a/test/hotspot/jtreg/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java +++ b/test/hotspot/jtreg/compiler/jsr292/patches/java.base/java/lang/invoke/MethodHandleHelper.java @@ -49,8 +49,8 @@ public class MethodHandleHelper { } @ForceInline - public static void linkToStatic(MethodHandle mh, float arg, Object name) throws Throwable { - MethodHandle.linkToStatic(mh, arg, name); + public static void linkToStatic(float arg, Object name) throws Throwable { + MethodHandle.linkToStatic(arg, name); } @ForceInline