Skip to content

Commit 242f113

Browse files
author
Yudi Zheng
committed
8334481: [JVMCI] add LINK_TO_NATIVE to MethodHandleAccessProvider.IntrinsicMethod
Reviewed-by: dnsimon
1 parent 66db715 commit 242f113

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

src/hotspot/share/jvmci/vmStructs_jvmci.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,7 @@
778778
declare_constant(vmIntrinsics::_linkToStatic) \
779779
declare_constant(vmIntrinsics::_linkToSpecial) \
780780
declare_constant(vmIntrinsics::_linkToInterface) \
781+
declare_constant(vmIntrinsics::_linkToNative) \
781782
\
782783
declare_constant(vmSymbols::FIRST_SID) \
783784
declare_constant(vmSymbols::SID_LIMIT) \

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodHandleAccessProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ public static IntrinsicMethod getMethodHandleIntrinsic(int intrinsicId) {
146146
return IntrinsicMethod.LINK_TO_STATIC;
147147
} else if (intrinsicId == config.vmIntrinsicLinkToVirtual) {
148148
return IntrinsicMethod.LINK_TO_VIRTUAL;
149+
} else if (intrinsicId == config.vmIntrinsicLinkToNative) {
150+
return IntrinsicMethod.LINK_TO_NATIVE;
149151
}
150152
return null;
151153
}

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfig.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@ final int baseVtableLength() {
342342
final int vmIntrinsicLinkToStatic = getConstant("vmIntrinsics::_linkToStatic", Integer.class);
343343
final int vmIntrinsicLinkToSpecial = getConstant("vmIntrinsics::_linkToSpecial", Integer.class);
344344
final int vmIntrinsicLinkToInterface = getConstant("vmIntrinsics::_linkToInterface", Integer.class);
345+
final int vmIntrinsicLinkToNative = getConstant("vmIntrinsics::_linkToNative", Integer.class);
345346

346347
final int codeInstallResultOk = getConstant("JVMCI::ok", Integer.class);
347348
final int codeInstallResultDependenciesFailed = getConstant("JVMCI::dependencies_failed", Integer.class);

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/MethodHandleAccessProvider.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ enum IntrinsicMethod {
4545
/** The method {@code MethodHandle.linkToVirtual}. */
4646
LINK_TO_VIRTUAL,
4747
/** The method {@code MethodHandle.linkToInterface}. */
48-
LINK_TO_INTERFACE
48+
LINK_TO_INTERFACE,
49+
/** The method {@code MethodHandle.linkToNative}. */
50+
LINK_TO_NATIVE
4951
}
5052

5153
/**

0 commit comments

Comments
 (0)