Skip to content

Commit

Permalink
Add condy for binding initialization during pattern matching
Browse files Browse the repository at this point in the history
  • Loading branch information
@biboudis
biboudis committed Jun 16, 2023
1 parent dd3a4b7 commit a898e7f
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 18 deletions.
76 changes: 58 additions & 18 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,9 @@ public void visitRecordPattern(JCRecordPattern tree) {

private UnrolledRecordPattern unrollRecordPattern(JCRecordPattern recordPattern) {
// if (o instanceof Matcher $m && Matcher."Matcher$Ljava\\|lang\\|String\\?$I"($m)) instanceof Object unmatched) {
// MethodType returnType = MethodType.methodType(Object.class, String.class, int.class); //TODO: return type of the Carrier constructor?
// os = (String) Carriers.component(returnType, 0).invoke(unmatched);
// oi = (int) Carriers.component(returnType, 1).invoke(unmatched);
// MethodType methodType = MethodType.methodType(Object.class, String.class, int.class); // represented as a DynamicVarSymbol
// os = (String) Carriers.component(methodType, 0).invoke(unmatched); // where Carriers.component(methodType, 0) is a DynamicVarSymbol
// oi = (int) Carriers.component(methodType, 1).invoke(unmatched); // where Carriers.component(methodType, 1) is a DynamicVarSymbol
// ...
// }
if (recordPattern.matcher != null) {
Expand All @@ -323,18 +323,39 @@ private UnrolledRecordPattern unrollRecordPattern(JCRecordPattern recordPattern)
JCExpression secondLevelChecks = null;
int index = -1;

// TODO: Load it through ConstantDynamic for perf
MethodSymbol methodTypeCallSym = rs.resolveInternalMethod(recordPattern.pos(), env, syms.methodTypeType, names.fromString("methodType"), List.of(syms.classType, types.makeArrayType(types.erasure(syms.classType))), List.nil());
List<JCExpression> params = recordPattern.matcher.params.map(v -> classOfType(types.erasure(v.type), recordPattern.pos())).prepend(classOfType(syms.objectType, recordPattern.pos()));
JCMethodInvocation methodTypeCall = make.App(make.QualIdent(methodTypeCallSym), params).setType(syms.methodTypeType);
methodTypeCall.varargsElement = types.erasure(types.elemtype(methodTypeCallSym.type.getParameterTypes().last()));
MethodSymbol methodTypeCallSym =
rs.resolveInternalMethod(recordPattern.pos(),
env,
syms.methodTypeType,
names.methodType,
List.of(syms.classType, syms.classType, types.makeArrayType(types.erasure(syms.classType))),
List.nil());

List<LoadableConstant> params = recordPattern.matcher.params
.map(v -> (LoadableConstant) types.erasure(v.type))
.prepend((LoadableConstant) syms.objectType);

DynamicVarSymbol methodTypeDynamicVar = (DynamicVarSymbol)
invokeMethodWrapper(names.methodType,
recordPattern.pos(),
methodTypeCallSym.asHandle(),
params.toArray(LoadableConstant[]::new));

VarSymbol methodTypeVar = new VarSymbol(Flags.SYNTHETIC,
names.fromString("index" + target.syntheticNameChar() + variableIndex++),
syms.methodTypeType,
currentMethodSym);

JCVariableDecl returnTypeVar = make.VarDef(methodTypeVar, methodTypeCall);
JCVariableDecl returnTypeVar = make.VarDef(methodTypeVar, make.Ident(methodTypeDynamicVar));

// Resolve Carriers.component(methodType, index) for subsequent constant dynamic call results
MethodSymbol carriersComponentCallSym =
rs.resolveInternalMethod(recordPattern.pos(),
env,
syms.carriersType,
names.component,
List.of(syms.methodTypeType, syms.intType),
List.nil());

// TODO: cleanup duplication
while (components.nonEmpty()) {
Expand Down Expand Up @@ -362,16 +383,31 @@ private UnrolledRecordPattern unrollRecordPattern(JCRecordPattern recordPattern)
}

/*
* Generate:
* Carriers.component(returnType, componentIndex).invoke(carrier);
* Generate invoke call for component X
* component$X.invoke(carrier);
* */
MethodSymbol carriersComponentCallSym = rs.resolveInternalMethod(recordPattern.pos(), env, syms.carriersType, names.fromString("component"), List.of(syms.methodTypeType, syms.intType), List.nil());
List<JCExpression> carriersComponentParams = List.of(methodTypeCall, makeLit(syms.intType, index));
JCMethodInvocation carriersComponentCall = make.App(make.QualIdent(carriersComponentCallSym), carriersComponentParams).setType(syms.methodHandleType);
List<LoadableConstant> carriersComponentParams =
List.of(methodTypeDynamicVar,
LoadableConstant.Int(index));

DynamicVarSymbol carriersComponentCallDynamicVar = (DynamicVarSymbol)
invokeMethodWrapper(names.fromString("component$" + index), recordPattern.pos(),
carriersComponentCallSym.asHandle(),
carriersComponentParams.toArray(LoadableConstant[]::new));

List<JCExpression> invokeComponentParams = List.of(make.Ident(unmatched));
MethodSymbol invokeComponentCallSym = rs.resolveInternalMethod(recordPattern.pos(), env, syms.methodHandleType, names.fromString("invoke"), List.of(syms.objectType), List.nil());
JCMethodInvocation invokeComponentCall = make.App(make.Select(carriersComponentCall, invokeComponentCallSym), invokeComponentParams);

MethodSymbol invokeComponentCallSym =
rs.resolveInternalMethod(recordPattern.pos(),
env,
syms.methodHandleType,
names.invoke,
List.of(syms.objectType),
List.nil());

JCMethodInvocation invokeComponentCall =
make.App(make.Select(make.Ident(carriersComponentCallDynamicVar),
invokeComponentCallSym), invokeComponentParams);

JCExpression accessedComponentValue = convert(invokeComponentCall, componentType);
JCInstanceOf firstLevelCheck = (JCInstanceOf) make.TypeTest(accessedComponentValue, nestedBinding).setType(syms.booleanType);
Expand Down Expand Up @@ -1055,6 +1091,10 @@ private LoadableConstant createEnumDesc(DiagnosticPosition pos, ClassSymbol enum
}

private LoadableConstant invokeMethodWrapper(DiagnosticPosition pos, MethodHandleSymbol toCall, LoadableConstant... params) {
return invokeMethodWrapper(names.invoke, pos, toCall, params);
}

private LoadableConstant invokeMethodWrapper(Name varName, DiagnosticPosition pos, MethodHandleSymbol toCall, LoadableConstant... params) {
List<Type> bsm_staticArgs = List.of(syms.methodHandleLookupType,
syms.stringType,
new ClassType(syms.classType.getEnclosingType(),
Expand All @@ -1072,7 +1112,7 @@ private LoadableConstant invokeMethodWrapper(DiagnosticPosition pos, MethodHandl

System.arraycopy(params, 0, actualParams, 1, params.length);

return new DynamicVarSymbol(bsm.name, bsm.owner, bsm.asHandle(), toCall.getReturnType(), actualParams);
return new DynamicVarSymbol(varName, bsm.owner, bsm.asHandle(), toCall.getReturnType(), actualParams);
}

@Override
Expand Down Expand Up @@ -1189,7 +1229,7 @@ public void visitMethodDef(JCMethodDecl tree) {
rs.resolveInternalMethod(tree.pos(),
env,
syms.methodTypeType,
names.fromString("methodType"),
names.methodType,
paramsForMethodType,
List.nil());

Expand Down
4 changes: 4 additions & 0 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ public static Names instance(Context context) {
public final Name hashCode;
public final Name init;
public final Name invoke;
public final Name component;
public final Name methodType;
public final Name iterator;
public final Name length;
public final Name next;
Expand Down Expand Up @@ -290,6 +292,8 @@ public Names(Context context) {
hashCode = fromString("hashCode");
init = fromString("<init>");
invoke = fromString("invoke");
component = fromString("component");
methodType = fromString("methodType");
iterator = fromString("iterator");
length = fromString("length");
next = fromString("next");
Expand Down

0 comments on commit a898e7f

Please sign in to comment.