infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-28 11:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

8350462: MethodTypeForm.LF_INTERPRET can cache the MemberName instead

Browse Source 
Reviewed-by: liach, jvernee
This commit is contained in:
Zihao Lin 2025-04-10 17:21:51 +00:00 committed by Chen Liang
parent 799e5b33a1
commit dc249be247
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,14 +371,6 @@ class LambdaForm {
return create(arity, names, DEFAULT_RESULT, forceInline, DEFAULT_CUSTOMIZED, kind);
}
private static LambdaForm createBlankForType(MethodType mt) {
// Make a dummy blank lambda form.
// It is used as a template for managing the invocation of similar forms that are non-empty.
// Called only from getPreparedForm.
LambdaForm form = new LambdaForm(0, 0, DEFAULT_FORCE_INLINE, DEFAULT_CUSTOMIZED, new Name[0], Kind.GENERIC);
return form;
}
private static int fixResult(int result, Name[] names) {
if (result == LAST_RESULT)
result = names.length - 1; // might still be void
@ -785,14 +777,15 @@ class LambdaForm {
return;
}
MethodType mtype = methodType();
LambdaForm prep = mtype.form().cachedLambdaForm(MethodTypeForm.LF_INTERPRET);
if (prep == null) {
MethodTypeForm form = mtype.form();
MemberName entry = form.cachedInterpretEntry();
if (entry == null) {
assert (isValidSignature(basicTypeSignature()));
prep = LambdaForm.createBlankForType(mtype);
prep.vmentry = InvokerBytecodeGenerator.generateLambdaFormInterpreterEntryPoint(mtype);
prep = mtype.form().setCachedLambdaForm(MethodTypeForm.LF_INTERPRET, prep);
entry = InvokerBytecodeGenerator.generateLambdaFormInterpreterEntryPoint(mtype);
entry = form.setCachedInterpretEntry(entry);
}
this.vmentry = prep.vmentry;
this.vmentry = entry;
// TO DO: Maybe add invokeGeneric, invokeWithArguments
}

16
src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java
View File

@ -64,6 +64,8 @@ final class MethodTypeForm {
// Cached lambda form information, for basic types only:
private final Object[] lambdaForms;
private SoftReference<MemberName> interpretEntry;
// Indexes into lambdaForms:
static final int
LF_INVVIRTUAL = 0, // DMH invokeVirtual
@ -72,7 +74,6 @@ final class MethodTypeForm {
LF_NEWINVSPECIAL = 3,
LF_INVINTERFACE = 4,
LF_INVSTATIC_INIT = 5, // DMH invokeStatic with <clinit> barrier
LF_INTERPRET = 6, // LF interpreter
LF_REBIND = 7, // BoundMethodHandle
LF_DELEGATE = 8, // DelegatingMethodHandle
LF_DELEGATE_BLOCK_INLINING = 9, // Counting DelegatingMethodHandle w/ @DontInline
@ -162,6 +163,19 @@ final class MethodTypeForm {
return form;
}
public MemberName cachedInterpretEntry() {
return (interpretEntry == null) ? null : interpretEntry.get();
}
public synchronized MemberName setCachedInterpretEntry(MemberName mn) {
MemberName prev = cachedInterpretEntry();
if (prev != null) {
return prev;
}
this.interpretEntry = new SoftReference<>(mn);
return mn;
}
/**
* Build an MTF for a given type, which must have all references erased to Object.
* This MTF will stand for that type and all un-erased variations.