Preserve generic static initializer order

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/translation/imtranslation/EliminateGenerics.java

@@ -61,6 +61,8 @@ private record RuntimeTypeUse(ImClass clazz, GenericTypes generics) {
     // NEW: Track specialized global variables for generic static fields
     // Key: (original generic global var, concrete type instantiation) -> specialized var
     private final Table<ImVar, GenericTypes, ImVar> specializedGlobals = HashBasedTable.create();
+    /** Last specialized initializer emitted for each original initializer, preserving discovery order. */
+    private final Map<ImStmt, ImStmt> specializedInitializerTails = new IdentityHashMap<>();
 
     // NEW: Track which global vars belong to which generic class
     // This helps us know which globals need specialization
@@ -2188,10 +2190,14 @@ private void createSpecializedGlobals(ImClass originalClass, GenericTypes generi
                     ImLExpr newLeft = specializeLhs.apply(origSet.getLeft());
                     ImSet specSet = JassIm.ImSet(originalGlobal.attrTrace(), newLeft, rhs);
 
-                    // schedule insertion right after origSet in its parent ImStmts
+                    // Append after earlier specializations of this initializer. Each invocation of
+                    // createSpecializedGlobals has its own insertion batch; always inserting after
+                    // origSet would therefore reverse specialization discovery/initializer order.
+                    ImStmt insertionPoint = specializedInitializerTails.getOrDefault(origSet, origSet);
                     IdentityHashMap<ImStmt, List<ImStmt>> byStmt =
                         insertsByParent.computeIfAbsent(parentStmts, k -> new IdentityHashMap<>());
-                    byStmt.computeIfAbsent(origSet, k -> new ArrayList<>(1)).add(specSet);
+                    byStmt.computeIfAbsent(insertionPoint, k -> new ArrayList<>(1)).add(specSet);
+                    specializedInitializerTails.put(origSet, specSet);
 
                     // keep prog.getGlobalInits consistent, but do NOT reuse the tree-attached node elsewhere
                     specializedInitsForMap.add((ImSet) specSet.copy());

de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/LuaBackendAuditTests.java

@@ -884,7 +884,7 @@ public void tupleSpecializedStaticKeepsAllLiveInitializers() {
             "    static function get() returns int",
             "        return value",
             "init",
-            "    if Box<int>.get() + Box<pair>.get() == 3 and Box<int>.get() != Box<pair>.get() and bumps == 2",
+            "    if Box<int>.get() == 1 and Box<pair>.get() == 2 and bumps == 2",
             "        testSuccess()"
         );
     }
@@ -902,10 +902,12 @@ public void tupleSpecializedStaticKeepsInitializerForConstructedErasedClass() {
             "class Box<T:>",
             "    static int value = bump()",
             "    construct()",
+            "    static function get() returns int",
+            "        return value",
             "init",
             "    new Box<int>()",
             "    new Box<pair>()",
-            "    if bumps == 2",
+            "    if Box<int>.get() == 1 and Box<pair>.get() == 2 and bumps == 2",
             "        testSuccess()"
         );
     }
@@ -1046,7 +1048,7 @@ public void eachConstructedErasedInstantiationGetsItsOwnStaticInitializer() {
             "init",
             "    new Box<string>()",
             "    new Box<real>()",
-            "    if Box<int>.get() >= 1 and bumps == 3",
+            "    if Box<string>.get() == 1 and Box<real>.get() == 2 and Box<int>.get() == 3 and bumps == 3",
             "        testSuccess()"
         );
     }