Skip to content

Lower Lua class instances to recycled integer IDs #1264

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

Merged
Frotty merged 6 commits into from
Aug 29, 2026
Merged

Lower Lua class instances to recycled integer IDs #1264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
93696b4
Lower Lua class instances to integer IDs
Frotty Aug 29, 2026
8e95e2a
Preserve generic field and lifecycle semantics
Frotty Aug 29, 2026
f9df6e5
Deduplicate canonical Lua class field storage
Frotty Aug 29, 2026
7bc22c8
Update Lua object layout assertions
Frotty Aug 29, 2026
1d25d92
Make Lua field allocation assertion non-vacuous
Frotty Aug 29, 2026
71a934d
Keep generic handles on object index mapping
Frotty Aug 29, 2026
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
43 changes: 29 additions & 14 deletions ...cript/src/main/java/de/peeeq/wurstscript/translation/lua/translation/ExprTranslation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,8 @@ public static LuaExpr translate(ImBoolVal e, LuaTranslator tr) {
}

public static LuaExpr translate(ImDealloc e, LuaTranslator tr) {
// Deliberate no-op: Lua instances are garbage collected, so 'destroy'
// only runs onDestroy (emitted separately) and drops nothing here.
// KNOWN DIVERGENCE from the Jass backend: a destroyed object stays
// fully usable (fields, dispatch, instanceof, typeId), whereas the
// Jass backend recycles the instance id and (with runtime checks)
// errors on use-after-destroy. Use-after-destroy bugs therefore stay
// silent on Lua but crash on Jass.
return LuaAst.LuaExprNull();
return LuaAst.LuaExprFunctionCall(tr.objectDealloc,
LuaAst.LuaExprlist(e.getObj().translateToLua(tr)));
}

public static LuaExpr translate(ImFuncRef e, LuaTranslator tr) {
Expand Down Expand Up @@ -117,7 +111,17 @@ public static LuaExpr translate(ImFunctionCall e, LuaTranslator tr) {
String tcFunc = tr.getTypeCastingFunctionName(e.getFunc());
if (tcFunc != null && !e.getArguments().isEmpty()) {
LuaExpr arg = e.getArguments().get(0).translateToLua(tr);
if (tcFunc.equals("stringToIndex")) {
ImType argumentType = e.getArguments().get(0).attrTyp();
ImType resultType = e.attrTyp();
if (argumentType instanceof ImClassType && TypesHelper.isIntType(resultType)) {
return LuaAst.LuaExprFunctionCall(tr.classToIndex, LuaAst.LuaExprlist(arg));
} else if (TypesHelper.isIntType(argumentType) && resultType instanceof ImClassType) {
return LuaAst.LuaExprFunctionCall(tr.classFromIndex, LuaAst.LuaExprlist(arg));
} else if (tcFunc.equals("objectToIndex")) {
return LuaAst.LuaExprFunctionCall(tr.toIndexFunction, LuaAst.LuaExprlist(arg));
} else if (tcFunc.equals("objectFromIndex")) {
return LuaAst.LuaExprFunctionCall(tr.fromIndexFunction, LuaAst.LuaExprlist(arg));
} else if (tcFunc.equals("stringToIndex")) {
return LuaAst.LuaExprFunctionCall(tr.stringToIndexFunction, LuaAst.LuaExprlist(arg));
} else if (tcFunc.equals("stringFromIndex")) {
return LuaAst.LuaExprFunctionCall(tr.stringFromIndexFunction, LuaAst.LuaExprlist(arg));
Expand Down Expand Up @@ -181,7 +185,9 @@ public static LuaExpr translate(ImIntVal e, LuaTranslator tr) {
}

public static LuaExpr translate(ImMemberAccess e, LuaTranslator tr) {
LuaExpr res = LuaAst.LuaExprFieldAccess(e.getReceiver().translateToLua(tr), e.getVar().getName());
LuaExpr res = LuaAst.LuaExprArrayAccess(
LuaAst.LuaExprVarAccess(tr.fieldStorage(e.getVar())),
LuaAst.LuaExprlist(e.getReceiver().translateToLua(tr)));
if (!e.getIndexes().isEmpty()) {
LuaExprlist indexes = LuaAst.LuaExprlist();
for (ImExpr index : e.getIndexes()) {
Expand All @@ -204,7 +210,9 @@ public static LuaExpr translate(ImMethodCall e, LuaTranslator tr) {
}
return LuaAst.LuaExprFunctionCall(tr.luaFunc.getFor(method.getImplementation()), args);
}
return LuaAst.LuaExprMethodCall(e.getReceiver().translateToLua(tr), tr.luaMethod.getFor(e.getMethod()), tr.translateExprList(e.getArguments()));
LuaExprlist args = LuaAst.LuaExprlist(e.getReceiver().translateToLua(tr));
args.addAll(tr.translateExprList(e.getArguments()).removeAll());
return LuaAst.LuaExprFunctionCall(tr.luaDispatchFunc.getFor(e.getMethod()), args);
}

public static LuaExpr translate(ImNull e, LuaTranslator tr) {
Expand Down Expand Up @@ -423,7 +431,10 @@ public static LuaExpr translate(ImTypeIdOfClass e, LuaTranslator tr) {
}

public static LuaExpr translate(ImTypeIdOfObj e, LuaTranslator tr) {
return LuaAst.LuaExprFieldAccess(e.getObj().translateToLua(tr), TYPE_ID);
return LuaAst.LuaExprFieldAccess(
LuaAst.LuaExprArrayAccess(LuaAst.LuaExprVarAccess(tr.objectClass),
LuaAst.LuaExprlist(e.getObj().translateToLua(tr))),
TYPE_ID);
}

public static LuaExpr translate(ImVarAccess e, LuaTranslator tr) {
Expand Down Expand Up @@ -476,9 +487,13 @@ public static LuaExpr translate(ImCast imCast, LuaTranslator tr) {
if (TypesHelper.isStringType(imCast.getExpr().attrTyp())) {
return LuaAst.LuaExprFunctionCall(tr.stringToIndexFunction, LuaAst.LuaExprlist(translated));
}
if (imCast.getExpr().attrTyp() instanceof ImClassType) {
return LuaAst.LuaExprFunctionCall(tr.classToIndex, LuaAst.LuaExprlist(translated));
}
return LuaAst.LuaExprFunctionCall(tr.toIndexFunction, LuaAst.LuaExprlist(translated));
} else if (imCast.getToType() instanceof ImClassType
|| imCast.getToType() instanceof ImAnyType) {
} else if (imCast.getToType() instanceof ImClassType) {
return LuaAst.LuaExprFunctionCall(tr.classFromIndex, LuaAst.LuaExprlist(translated));
} else if (imCast.getToType() instanceof ImAnyType) {
return LuaAst.LuaExprFunctionCall(tr.fromIndexFunction, LuaAst.LuaExprlist(translated));
} else {
return translated;
Expand Down
4 changes: 3 additions & 1 deletion ...ript/src/main/java/de/peeeq/wurstscript/translation/lua/translation/LuaPolyfillSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ private LuaPolyfillSetup() {}
static void createInstanceOfFunction(LuaTranslator tr) {
tr.instanceOfFunction.getParams().add(LuaAst.LuaVariable("x", LuaAst.LuaNoExpr()));
tr.instanceOfFunction.getParams().add(LuaAst.LuaVariable("A", LuaAst.LuaNoExpr()));
tr.instanceOfFunction.getBody().add(LuaAst.LuaLiteral("return x ~= nil and x." + WURST_SUPERTYPES + "[A]"));
tr.instanceOfFunction.getBody().add(LuaAst.LuaLiteral(
"return x ~= nil and __wurst_objectClass[x] ~= nil and __wurst_objectClass[x]."
+ WURST_SUPERTYPES + "[A]"));
tr.luaModel.add(tr.instanceOfFunction);
}

Expand Down
Loading
Loading