From 1e340f289d5a3f6eb0bbe4ffc83a1c8b9652ec73 Mon Sep 17 00:00:00 2001 From: Gene Gleyzer Date: Tue, 17 Nov 2026 15:06:02 -0500 Subject: [PATCH 1/2] Fix anonymous inner class compilation --- .../org/xvm/compiler/ast/NewExpression.java | 1 + manualTests/src/main/x/innerouter.x | 38 +++++++++++++++---- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/javatools/src/main/java/org/xvm/compiler/ast/NewExpression.java b/javatools/src/main/java/org/xvm/compiler/ast/NewExpression.java index d6fbf060a5..85d08254d6 100644 --- a/javatools/src/main/java/org/xvm/compiler/ast/NewExpression.java +++ b/javatools/src/main/java/org/xvm/compiler/ast/NewExpression.java @@ -709,6 +709,7 @@ protected Expression validate(Context ctx, TypeConstant typeRequired, ErrorListe m_mapRegisters = ctxAnon.ensureRegisterMap(); m_fInstanceChild = ctxAnon.isInstanceChild(); m_ctxCapture = null; + plan = m_fInstanceChild ? Plan.Child : Plan.Regular; // make sure the capture names don't collide ClassStructure clzAnon = ctxAnon.getThisClass(); diff --git a/manualTests/src/main/x/innerouter.x b/manualTests/src/main/x/innerouter.x index 4440769d73..c67b3c8ea0 100644 --- a/manualTests/src/main/x/innerouter.x +++ b/manualTests/src/main/x/innerouter.x @@ -85,22 +85,47 @@ module TestInnerOuter { class Inner { construct(String s) {} + Int inc() = 0; } Int i = 4; - // var o = new Object() - var o = new Inner("hello") { + var inner = new Inner("hello") { void run() { console.print($"in run (i={i})"); ++i; - // foo(); } }; - o.run(); + inner.run(); - console.print($"done (i={i})"); + console.print($"done ({i=})"); + + class Outer { + Inner inner; + + construct() { + Int count = 0; + var value = new Inner("") { + @Override + Int inc() { + return ++count; + } + }; + + inner = value; + assert this.toString().size > 0; + } + + @Override + String toString() { + assert as "should no be called"; + } + } + + Outer o = new Outer(); + assert o.inner.inc() == 1; + assert o.inner.inc() == 2; } interface FunkyOuter { @@ -255,7 +280,6 @@ module TestInnerOuter { Holder.Inner inner = holder.new Inner(); assert inner.textByOuter == "Held"; assert inner.outer.text == "Held"; - // console.print($"inner.textByOuter={inner.textByOuter}"); Shelf.Inner item = new Shelf.Inner(3); assert item.size == 3; @@ -263,12 +287,10 @@ module TestInnerOuter { Shelf shelf = new Shelf("Top"); Shelf.Drawer drawer = shelf.new Drawer(); assert drawer.labelByOuter == "Top"; - // console.print($"item={item}, drawer.labelByOuter={drawer.labelByOuter}"); Box box = new Box(); assert box.new Inner().kind() == "box"; Box crate = new Crate(); assert crate.new Inner().kind() == "crate"; - // console.print($"box={box.new Inner().kind()}, crate={crate.new Inner().kind()}"); } } From c8bf789565ecb4902ea7f26600d13a4743e0df18 Mon Sep 17 00:00:00 2001 From: Gene Gleyzer Date: Wed, 18 Nov 2026 12:27:57 -0500 Subject: [PATCH 2/2] Disable access to annotated property structure --- .../java/org/xvm/runtime/ClassTemplate.java | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/javatools/src/main/java/org/xvm/runtime/ClassTemplate.java b/javatools/src/main/java/org/xvm/runtime/ClassTemplate.java index c68d46d8a6..c4ebe38730 100644 --- a/javatools/src/main/java/org/xvm/runtime/ClassTemplate.java +++ b/javatools/src/main/java/org/xvm/runtime/ClassTemplate.java @@ -748,15 +748,10 @@ public int getPropertyValue(Frame frame, ObjectHandle hTarget, PropertyConstant return invokeNativeGet(frame, idProp.getName(), hTarget, iReturn); } - if (chain.isField()) { + if (chain.isField() || clzTarget.isStruct()) { return clzTarget.getFieldValue(frame, hTarget, idProp, iReturn); } - if (clzTarget.isStruct()) { - return frame.raiseException("Invalid property \"" + idProp.getName() + - "\" access from " + clzTarget.getType().getValueString()); - } - MethodStructure method = chain.getTop(); ObjectHandle[] ahVar = new ObjectHandle[method.getMaxVars()]; FieldInfo field = clzTarget.getFieldInfo(idProp); @@ -876,6 +871,12 @@ public int getFieldValue(Frame frame, ObjectHandle hTarget, PropertyConstant idP if (field.isInflated()) { RefHandle hRef = (RefHandle) hValue; if (!(hRef instanceof FutureHandle)) { + if (hThis.isStruct()) { + // TODO: ideally this should return a structure for the inflated property + return frame.raiseException(xException.unsupported(frame, + "structure for ref annotated property \"" + field.getName() + "\"")); + } + if (hRef.getComposition().isStruct()) { Frame.Continuation stepNext = frameCaller -> { RefHandle hR = (RefHandle) frameCaller.popStack(); @@ -1119,7 +1120,7 @@ public int invokeNativeSet(Frame frame, ObjectHandle hTarget, String sPropName, * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePreInc(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, int iReturn) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarPreInc(frame, hRef, iReturn); @@ -1139,7 +1140,7 @@ public int invokePreInc(Frame frame, ObjectHandle hTarget, PropertyConstant idPr * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePostInc(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, int iReturn) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarPostInc(frame, hRef, iReturn); @@ -1159,7 +1160,7 @@ public int invokePostInc(Frame frame, ObjectHandle hTarget, PropertyConstant idP * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePreDec(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, int iReturn) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarPreDec(frame, hRef, iReturn); @@ -1179,7 +1180,7 @@ public int invokePreDec(Frame frame, ObjectHandle hTarget, PropertyConstant idPr * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePostDec(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, int iReturn) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarPostDec(frame, hRef, iReturn); @@ -1199,7 +1200,7 @@ public int invokePostDec(Frame frame, ObjectHandle hTarget, PropertyConstant idP * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePropertyAdd(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarAdd(frame, hRef, hArg); @@ -1220,7 +1221,7 @@ public int invokePropertyAdd(Frame frame, ObjectHandle hTarget, PropertyConstant * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePropertySub(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarSub(frame, hRef, hArg); @@ -1241,7 +1242,7 @@ public int invokePropertySub(Frame frame, ObjectHandle hTarget, PropertyConstant * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePropertyMul(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarMul(frame, hRef, hArg); @@ -1262,7 +1263,7 @@ public int invokePropertyMul(Frame frame, ObjectHandle hTarget, PropertyConstant * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePropertyDiv(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarDiv(frame, hRef, hArg); @@ -1283,7 +1284,7 @@ public int invokePropertyDiv(Frame frame, ObjectHandle hTarget, PropertyConstant * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePropertyMod(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarMod(frame, hRef, hArg); @@ -1304,7 +1305,7 @@ public int invokePropertyMod(Frame frame, ObjectHandle hTarget, PropertyConstant * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePropertyShl(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarShl(frame, hRef, hArg); @@ -1325,7 +1326,7 @@ public int invokePropertyShl(Frame frame, ObjectHandle hTarget, PropertyConstant * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePropertyShr(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarShr(frame, hRef, hArg); @@ -1346,7 +1347,7 @@ public int invokePropertyShr(Frame frame, ObjectHandle hTarget, PropertyConstant * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePropertyShrAll(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarShrAll(frame, hRef, hArg); @@ -1367,7 +1368,7 @@ public int invokePropertyShrAll(Frame frame, ObjectHandle hTarget, PropertyConst * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePropertyAnd(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarAnd(frame, hRef, hArg); @@ -1388,7 +1389,7 @@ public int invokePropertyAnd(Frame frame, ObjectHandle hTarget, PropertyConstant * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePropertyOr(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarOr(frame, hRef, hArg); @@ -1409,7 +1410,7 @@ public int invokePropertyOr(Frame frame, ObjectHandle hTarget, PropertyConstant * @return one of the {@link Op#R_NEXT}, {@link Op#R_CALL} or {@link Op#R_EXCEPTION} values */ public int invokePropertyXor(Frame frame, ObjectHandle hTarget, PropertyConstant idProp, ObjectHandle hArg) { - if (hTarget.isInflated(idProp)) { + if (hTarget.isInflated(idProp) && !hTarget.isStruct()) { GenericHandle hThis = (GenericHandle) hTarget; RefHandle hRef = (RefHandle) hThis.getField(frame, idProp); return hRef.getVarSupport().invokeVarXor(frame, hRef, hArg);