infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-16 01:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stage

Browse Source
This commit is contained in:
Chen Liang 2025-12-02 16:33:01 -06:00
parent b8039d658f
commit 7ca6a5ce7d
5 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/share/classfile/vmIntrinsics.hpp
View File

@ -700,7 +700,7 @@ class methodHandle;
do_signature(profileBoolean_signature, "(Z[I)Z") \
do_intrinsic(_isCompileConstant, java_lang_invoke_MethodHandleImpl, isCompileConstant_name, isCompileConstant_signature, F_S) \
do_name( isCompileConstant_name, "isCompileConstant") \
do_alias( isCompileConstant_signature, object_int_signature) \
do_alias( isCompileConstant_signature, object_boolean_signature) \
\
do_intrinsic(_getObjectSize, sun_instrument_InstrumentationImpl, getObjectSize_name, getObjectSize_signature, F_RN) \
do_name( getObjectSize_name, "getObjectSize0") \

2
src/hotspot/share/opto/library_call.cpp
View File

@ -8923,7 +8923,7 @@ bool LibraryCallKit::inline_profileBoolean() {
bool LibraryCallKit::inline_isCompileConstant() {
Node* n = argument(0);
set_result(n->is_Con() ? intcon(1) : intcon(2));
set_result(n->is_Con() ? intcon(1) : intcon(0));
return true;
}

2
src/java.base/share/classes/java/lang/invoke/Invokers.java
View File

@ -621,7 +621,7 @@ class Invokers {
@ForceInline
/*non-public*/
static void checkCustomized(MethodHandle mh) {
if (MethodHandleImpl.isCompileConstant(mh) == MethodHandleImpl.CONSTANT_YES) {
if (MethodHandleImpl.isCompileConstant(mh)) {
return; // no need to customize a MH when the instance is known to JIT
}
if (mh.form.customized == null) { // fast approximate check that the underlying form is already customized

13
src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
View File

@ -621,16 +621,13 @@ abstract class MethodHandleImpl {
return result;
}
static final int CONSTANT_PENDING = 0;
static final int CONSTANT_YES = 1;
static final int CONSTANT_NO = 2;
// Intrinsified by C2. Returns 0 if not ready, 1 if obj is a compile-time constant,
// 2 if obj is not a compile-time constant.
// Intrinsified by C2. Returns true if obj is a compile-time constant.
// Note that a non-constant value may be subsequently promoted to a constant,
// so a false return value does not indicate obj is definitely not a constant.
@Hidden
@jdk.internal.vm.annotation.IntrinsicCandidate
static int isCompileConstant(Object obj) {
return CONSTANT_PENDING;
static boolean isCompileConstant(Object obj) {
return false;
}
static MethodHandle makeGuardWithTest(MethodHandle test,

21
src/java.base/share/classes/java/lang/invoke/VarHandle.java
View File

@ -2016,9 +2016,10 @@ public abstract sealed class VarHandle implements Constable
final Class<?> returnType;
final int type;
final int mode;
// The cache for adapted MH if the access site has a constant VH
// that does not match the erased type for.
@Stable MethodHandle adaptedMh;
// The cache for last adapted MH if the access site has a VH that does
// not match the erased type for. It can be safely reused if VH is
// discovered to be a constant during C2 compilation.
@Stable MethodHandle lastAdaption;
AccessDescriptor(MethodType symbolicMethodType, int type, int mode) {
this.symbolicMethodTypeExact = symbolicMethodType;
@ -2031,21 +2032,15 @@ public abstract sealed class VarHandle implements Constable
@ForceInline
MethodHandle adaptedMethodHandle(VarHandle vh) {
var constant = MethodHandleImpl.isCompileConstant(vh);
if (constant == MethodHandleImpl.CONSTANT_YES) {
var cache = adaptedMh;
if (MethodHandleImpl.isCompileConstant(vh)) {
var cache = lastAdaption;
if (cache != null) {
return cache;
}
}
// This is still a hot path if vh is not constant - in this case,
// asType is the bottleneck for constant folding, unfortunately
var result = vh.getMethodHandle(mode).asType(symbolicMethodTypeInvoker);
if (constant != MethodHandleImpl.CONSTANT_NO) {
adaptedMh = result;
}
return result;
// Keep capturing - vh may suddenly get promoted to a constant by C2
return lastAdaption = vh.getMethodHandle(mode).asType(symbolicMethodTypeInvoker);
}
}