archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8272614: Unused parameters in MethodHandleNatives linking methods

Browse source 
Reviewed-by: dholmes, lfoltan
This commit is contained in:
Harold Seigel 2021-10-20 15:48:43 +00:00
parent 7e28bdd1eb
commit bbc606117f
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/hotspot/share/classfile/systemDictionary.cpp
View file

@ -2352,11 +2352,10 @@ void SystemDictionary::invoke_bootstrap_method(BootstrapInfo& bootstrap_specifie
assert(appendix_box->obj_at(0) == NULL, ""); assert(appendix_box->obj_at(0) == NULL, "");
} }
// call condy: java.lang.invoke.MethodHandleNatives::linkDynamicConstant(caller, condy_index, bsm, type, info) // call condy: java.lang.invoke.MethodHandleNatives::linkDynamicConstant(caller, bsm, type, info)
// indy: java.lang.invoke.MethodHandleNatives::linkCallSite(caller, indy_index, bsm, name, mtype, info, &appendix) // indy: java.lang.invoke.MethodHandleNatives::linkCallSite(caller, bsm, name, mtype, info, &appendix)
JavaCallArguments args; JavaCallArguments args;
args.push_oop(Handle(THREAD, bootstrap_specifier.caller_mirror())); args.push_oop(Handle(THREAD, bootstrap_specifier.caller_mirror()));
args.push_int(bootstrap_specifier.bss_index());
args.push_oop(bootstrap_specifier.bsm()); args.push_oop(bootstrap_specifier.bsm());
args.push_oop(bootstrap_specifier.name_arg()); args.push_oop(bootstrap_specifier.name_arg());
args.push_oop(bootstrap_specifier.type_arg()); args.push_oop(bootstrap_specifier.type_arg());

4
src/hotspot/share/classfile/vmSymbols.hpp
View file

@ -339,9 +339,9 @@
template(linkMethod_name, "linkMethod") \ template(linkMethod_name, "linkMethod") \
template(linkMethod_signature, "(Ljava/lang/Class;ILjava/lang/Class;Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/invoke/MemberName;") \ template(linkMethod_signature, "(Ljava/lang/Class;ILjava/lang/Class;Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/invoke/MemberName;") \
template(linkDynamicConstant_name, "linkDynamicConstant") \ template(linkDynamicConstant_name, "linkDynamicConstant") \
template(linkDynamicConstant_signature, "(Ljava/lang/Object;ILjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;") \ template(linkDynamicConstant_signature, "(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;") \
template(linkCallSite_name, "linkCallSite") \ template(linkCallSite_name, "linkCallSite") \
template(linkCallSite_signature, "(Ljava/lang/Object;ILjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/invoke/MemberName;") \ template(linkCallSite_signature, "(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/invoke/MemberName;") \
template(setTargetNormal_name, "setTargetNormal") \ template(setTargetNormal_name, "setTargetNormal") \
template(setTargetVolatile_name, "setTargetVolatile") \ template(setTargetVolatile_name, "setTargetVolatile") \
template(setTarget_signature, "(Ljava/lang/invoke/MethodHandle;)V") \ template(setTarget_signature, "(Ljava/lang/invoke/MethodHandle;)V") \

4
src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -258,7 +258,6 @@ class MethodHandleNatives {
* The JVM is linking an invokedynamic instruction. Create a reified call site for it. * The JVM is linking an invokedynamic instruction. Create a reified call site for it.
*/ */
static MemberName linkCallSite(Object callerObj, static MemberName linkCallSite(Object callerObj,
int indexInCP,
Object bootstrapMethodObj, Object bootstrapMethodObj,
Object nameObj, Object typeObj, Object nameObj, Object typeObj,
Object staticArguments, Object staticArguments,
@ -317,7 +316,6 @@ class MethodHandleNatives {
// this implements the upcall from the JVM, MethodHandleNatives.linkDynamicConstant: // this implements the upcall from the JVM, MethodHandleNatives.linkDynamicConstant:
static Object linkDynamicConstant(Object callerObj, static Object linkDynamicConstant(Object callerObj,
int indexInCP,
Object bootstrapMethodObj, Object bootstrapMethodObj,
Object nameObj, Object typeObj, Object nameObj, Object typeObj,
Object staticArguments) { Object staticArguments) {