Skip to content

Local class model #692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mabbay wants to merge 5 commits into
base: code-reflection
Choose a base branch
from
Open

Local class model #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9910355
Model local class (Iteration 1)
mabbay Nov 11, 2025
805da88
Merge branch 'code-reflection' into local-class
mabbay Nov 19, 2025
5016201
Adopt the merge of MethodRef and ConstructorRef
mabbay Nov 19, 2025
504cbc7
Add class type attribute to ClassDecOp
mabbay Nov 20, 2025
98fd78e
Merge branch 'local-class' into local-class-model
mabbay Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 70 additions & 1 deletion src/jdk.incubator.code/share/classes/jdk/incubator/code/dialect/java/JavaOp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ public InvokeOp transform(CopyContext cc, OpTransformer ot) {

static void validateArgCount(InvokeKind invokeKind, boolean isVarArgs, MethodRef invokeDescriptor, List<Value> operands) {
int paramCount = invokeDescriptor.type().parameterTypes().size();
int argCount = operands.size() - (invokeKind == InvokeKind.STATIC ? 0 : 1);
int argCount = operands.size() - (invokeKind == InvokeKind.STATIC || invokeDescriptor.isConstructor() ? 0 : 1);
if ((!isVarArgs && argCount != paramCount)
|| argCount < paramCount - 1) {
throw new IllegalArgumentException(invokeKind + " " + isVarArgs + " " + invokeDescriptor);
Expand Down Expand Up @@ -4950,6 +4950,70 @@ public TypeElement resultType() {
}
}

@OpDeclaration(ClassDecOp.NAME)
public static final class ClassDecOp extends JavaOp
implements Op.Nested {

static final String NAME = "class.dec";
static final String ATTRIBUTE_CLASS_TYPE = NAME + ".type";

private final ClassType classType;
private final Body fieldsAndMethods;

ClassDecOp(ExternalizedOp def) {
// Required attribute
ClassType classType = def.extractAttributeValue(ATTRIBUTE_CLASS_TYPE,
true, v -> switch (v) {
case ClassType ct -> ct;
case null, default ->
throw new UnsupportedOperationException("Unsupported class type value:" + v);
});

Body.Builder fieldsAndMethods = def.bodyDefinitions().get(0);

this(classType, fieldsAndMethods);
}

ClassDecOp(ClassType classType, Body.Builder fieldsAndMethods) {
super(List.of());

this.classType = classType;
this.fieldsAndMethods = fieldsAndMethods.build(this);
}

ClassDecOp(ClassDecOp that, CopyContext cc, OpTransformer ot) {
super(that, cc);

this.classType = that.classType;
this.fieldsAndMethods = that.fieldsAndMethods.transform(cc, ot).build(this);
}

@Override
public Op transform(CopyContext cc, OpTransformer ot) {
return new ClassDecOp(this, cc, ot);
}

@Override
public TypeElement resultType() {
// @@@ for now
return VOID;
}

@Override
public List<Body> bodies() {
return List.of(fieldsAndMethods);
}

@Override
public Map<String, Object> externalize() {
return Map.of("", classType);
}
}

public static ClassDecOp classDecOp(ClassType classType, Body.Builder fieldsAndMethods) {
return new ClassDecOp(classType, fieldsAndMethods);
}

static Op createOp(ExternalizedOp def) {
Op op = switch (def.name()) {
case "add" -> new AddOp(def);
Expand Down Expand Up @@ -5012,6 +5076,11 @@ static Op createOp(ExternalizedOp def) {
case "sub" -> new SubOp(def);
case "throw" -> new ThrowOp(def);
case "xor" -> new XorOp(def);
case "class.dec" -> new ClassDecOp(def);
// @@@ better error reporting
// instead of:
//Caused by: java.lang.NullPointerException: Cannot invoke "jdk.incubator.code.Op.result()" because "op" is null
//at jdk.incubator.code/jdk.incubator.code.Block$Builder.op(Block.java:688)
default -> null;
};
if (op != null) {
Expand Down
117 changes: 111 additions & 6 deletions src/jdk.incubator.code/share/classes/jdk/incubator/code/internal/ReflectMethods.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,12 +438,21 @@ class BodyScanner extends TreeScannerPrev {
private Type pt = Type.noType;
private final boolean isQuoted;
private Type bodyTarget;
private final Map<Symbol, List<Symbol>> localCaptures = new HashMap<>();
private Map<Symbol, List<Symbol>> localCaptures = new HashMap<>();

BodyScanner(JCMethodDecl tree) {
this(tree, null);
}

BodyScanner(JCMethodDecl md, BodyStack stack) {
this(md, new LinkedHashMap<>(), stack);
}

BodyScanner(JCMethodDecl tree, Map<Symbol, List<Symbol>> localCaptures, BodyStack parent) {
this.tree = tree;
this.name = tree.name;
this.isQuoted = false;
this.localCaptures = localCaptures;

List<TypeElement> parameters = new ArrayList<>();
int blockArgOffset = 0;
Expand All @@ -460,7 +469,7 @@ class BodyScanner extends TreeScannerPrev {
FunctionType bodyType = CoreType.functionType(
typeToTypeElement(tree.sym.type.getReturnType()), parameters);

this.stack = this.top = new BodyStack(null, tree.body, bodyType);
this.stack = this.top = new BodyStack(parent, tree.body, bodyType);

// @@@ this as local variable? (it can never be stored to)
for (int i = 0 ; i < tree.params.size() ; i++) {
Expand Down Expand Up @@ -1009,7 +1018,15 @@ public void visitIdent(JCIdent tree) {
if (sym.isStatic()) {
result = append(JavaOp.fieldLoad(resultType, fr));
} else {
result = append(JavaOp.fieldLoad(resultType, fr, thisValue()));
// field owner sym is mapped to a value that represents the receiver
// by default, the receiver is the @CodeReflection method class instance
Value receiver;
try {
receiver = loadVar(tree.sym.owner);
} catch (NoSuchElementException e) {
receiver = thisValue();
}
result = append(JavaOp.fieldLoad(resultType, fr, receiver)); // instead look for a symbol of the same type as field ref, in stacks
}
}
}
Expand Down Expand Up @@ -1061,7 +1078,13 @@ public void visitSelect(JCFieldAccess tree) {
switch (sym.getKind()) {
case FIELD, ENUM_CONSTANT -> {
if (sym.name.equals(names._this) || sym.name.equals(names._super)) {
result = thisValue();
try {
// e.g. Foo.this
// we will load the value mapped to Foo symbol
result = loadVar(tree.selected.type.tsym);
} catch (NoSuchElementException e) {
result = thisValue();
}
} else {
FieldRef fr = symbolToFieldRef(sym, qualifierTarget.hasTag(NONE) ?
tree.selected.type : qualifierTarget);
Expand Down Expand Up @@ -1109,7 +1132,9 @@ public void visitApply(JCTree.JCMethodInvocation tree) {
Symbol sym = access.sym;
List<Value> args = new ArrayList<>();
JavaOp.InvokeOp.InvokeKind ik;
if (!sym.isStatic()) {
if (sym.isConstructor()) {
ik = JavaOp.InvokeOp.InvokeKind.SUPER;
} else if (!sym.isStatic()) {
ik = JavaOp.InvokeOp.InvokeKind.INSTANCE;
args.add(thisValue());
} else {
Expand All @@ -1119,6 +1144,10 @@ public void visitApply(JCTree.JCMethodInvocation tree) {
args.addAll(scanMethodArguments(tree.args, tree.meth.type, tree.varargsElement));

MethodRef mr = symbolToMethodRef(sym, symbolSiteType(sym));
if (sym.isConstructor()) {
// the above mr will have return type void
mr = MethodRef.constructor(mr.refType(), mr.type().parameterTypes());
}
Value res = append(JavaOp.invoke(ik, tree.varargsElement != null,
typeToTypeElement(meth.type.getReturnType()), mr, args));
if (sym.type.getReturnType().getTag() != TypeTag.VOID) {
Expand Down Expand Up @@ -1356,7 +1385,8 @@ public void visitNewClass(JCTree.JCNewClass tree) {
Type type = tree.type;
Type outer = type.getEnclosingType();
List<Value> args = new ArrayList<>();
if (!outer.hasTag(TypeTag.NONE)) {
// do this for inner class but not for local class
if (!tree.type.tsym.isDirectlyOrIndirectlyLocal() && !outer.hasTag(TypeTag.NONE)) {
// Obtain outer value for inner class, and add as first argument
JCTree.JCExpression encl = tree.encl;
Value outerInstance;
Expand All @@ -1369,6 +1399,19 @@ public void visitNewClass(JCTree.JCNewClass tree) {
argtypes.add(outerInstance.type());
}
if (tree.type.tsym.isDirectlyOrIndirectlyLocal()) {
// for local class, add outer instance as arg if applicable
Symbol ownerMethod = tree.type.tsym.owner; // the method where the local class is defined
if (!ownerMethod.isStatic()) {
Symbol outerClass = ownerMethod.owner;
Value outerInstance;
try {
outerInstance = loadVar(outerClass);
} catch (NoSuchElementException e) {
outerInstance = thisValue();
}
args.add(outerInstance);
argtypes.add(outerInstance.type());
}
for (Symbol c : localCaptures.get(tree.type.tsym)) {
args.add(loadVar(c));
argtypes.add(symbolToErasedDesc(c));
Expand Down Expand Up @@ -2436,6 +2479,68 @@ protected void addFreeVars(ClassSymbol c) {
}
FreeVarScanner fvs = new FreeVarScanner();
localCaptures.put(tree.sym, List.copyOf(fvs.analyzeCaptures()));

ListBuffer<Symbol> capturesSymbols = new ListBuffer<>();
Symbol ownerMethod = tree.sym.owner;
if (!ownerMethod.isStatic()) {
capturesSymbols.add(ownerMethod.owner);
}
capturesSymbols.addAll(localCaptures.get(tree.sym));

pushBody(tree, FunctionType.FUNCTION_TYPE_VOID);

// fields declarations
List<JCTree> fieldsDec = tree.defs.stream().filter(d -> d instanceof JCVariableDecl).toList();
// fields for the local class captures
List<Op.Result> fieldsForCaptures = new ArrayList<>();
for (Symbol capturesSymbol : capturesSymbols) {
Op.Result r = append(CoreOp.var(typeToTypeElement(capturesSymbol.type)));
fieldsForCaptures.add(r);
stack.localToOp.put(capturesSymbol, r);
}
// fields of the local class
for (JCTree fd : fieldsDec) {
scan(fd);
}

// methods declarations
List<JCTree> methodsDec = tree.defs.stream().filter(d -> d instanceof JCMethodDecl).toList();
for (JCTree md : methodsDec) {
// We pass the stack to have the mapping of captures to fields available
CoreOp.FuncOp funcOp = new BodyScanner((JCMethodDecl) md, localCaptures, stack).scanMethod();
if (!((JCMethodDecl) md).sym.isConstructor()) {
append(funcOp);
continue;
}
// for a constructor, we modify the created funcOp by adding params that represent captures,
// plus operations that assign these params to the right fields
List<TypeElement> newParamsTypes = new ArrayList<>();
// add params that represent captures
newParamsTypes.addAll(capturesSymbols.stream().map(s -> typeToTypeElement(s.type)).toList());
// add original params expect the first one that represent the local class instance
newParamsTypes.addAll(funcOp.invokableType().parameterTypes().stream().skip(1).toList());
// @@@ simple way of doing this kind of transformation ?
Body.Builder nfbody = Body.Builder.of(stack.body, CoreType.functionType(funcOp.resultType(), newParamsTypes));
Block.Builder nfblock = nfbody.entryBlock();
nfblock.body(funcOp.body(), nfblock.parameters().subList(capturesSymbols.length(), nfblock.parameters().size()),
(block, op) -> {
if (op instanceof Op.Terminating) {
List<Block.Parameter> paramsForCaptures = nfblock.parameters().subList(0, capturesSymbols.length());
for (int i = 0; i < paramsForCaptures.size(); i++) {
block.op(CoreOp.varStore(fieldsForCaptures.get(i), paramsForCaptures.get(i)));
}
}
block.op(op);
return block;
});
funcOp = CoreOp.func(funcOp.funcName(), nfbody);
append(funcOp);
}
append(CoreOp.core_yield());
Body.Builder body = stack.body;
popBody();

result = append(JavaOp.classDecOp((ClassType) symbolToErasedDesc(tree.sym), body));
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/jdk.incubator.code/share/classes/jdk/incubator/code/interpreter/Interpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,8 @@ private Quoted __internal_quoted() {
}
lock.unlock();
return null;
} if (o instanceof JavaOp.ClassDecOp) {
return null;
} else {
throw interpreterException(
new UnsupportedOperationException("Unsupported operation: " + o));
Expand Down
Loading