Normalize erased generic range bounds

Author: Frotty

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

@@ -13,6 +13,7 @@
 import de.peeeq.wurstscript.types.TypesHelper;
 import de.peeeq.wurstscript.types.WurstType;
 import de.peeeq.wurstscript.types.WurstTypeArray;
+import de.peeeq.wurstscript.types.WurstTypeInt;
 import de.peeeq.wurstscript.types.WurstTypeVararg;
 import org.eclipse.jdt.annotation.Nullable;
 
@@ -293,8 +294,8 @@ private static ImStmt case_StmtForRange(ImTranslator t, ImFunction f, LocalVarDe
         List<ImStmt> result = Lists.newArrayList();
         result.add(ImSet(loopVar, ImVarAccess(imLoopVar), fromExpr));
 
-        ImExpr toExpr = addCacheVariableSmart(t, f, result, to, TypesHelper.imInt());
-        ImExpr stepExpr = addCacheVariableSmart(t, f, result, step, TypesHelper.imInt());
+        ImExpr toExpr = addCacheVariableSmart(t, f, result, to, TypesHelper.imInt(), WurstTypeInt.instance());
+        ImExpr stepExpr = addCacheVariableSmart(t, f, result, step, TypesHelper.imInt(), WurstTypeInt.instance());
 
         ImStmts imBody = ImStmts();
         // exitwhen imLoopVar > toExpr
@@ -310,6 +311,18 @@ private static ImStmt case_StmtForRange(ImTranslator t, ImFunction f, LocalVarDe
 
     private static ImExpr addCacheVariableSmart(ImTranslator t, ImFunction f, List<ImStmt> result, Expr toCache, ImType type) {
         ImExpr r = toCache.imTranslateExpr(t, f);
+        return addCacheVariableSmart(t, f, result, toCache, type, r);
+    }
+
+    private static ImExpr addCacheVariableSmart(ImTranslator t, ImFunction f, List<ImStmt> result,
+                                                Expr toCache, ImType type, WurstType expectedType) {
+        ImExpr r = toCache.imTranslateExpr(t, f);
+        r = ExprTranslation.wrapTranslation(toCache, t, r, toCache.attrTypRaw(), expectedType);
+        return addCacheVariableSmart(t, f, result, toCache, type, r);
+    }
+
+    private static ImExpr addCacheVariableSmart(ImTranslator t, ImFunction f, List<ImStmt> result,
+                                                Expr toCache, ImType type, ImExpr r) {
         if (r instanceof ImConst) {
             return r;
         }

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

@@ -2210,7 +2210,10 @@ public void erasedGenericPrimitiveDefaultsAreNormalizedAtConcreteUse() throws IO
             "    let box = new Box<int>",
             "    values[box.get()] = 7",
             "    if box.get() + 1 == 1",
-            "        testSuccess()"
+            "        testSuccess()",
+            "    for i = 1 to box.get()",
+            "        testSuccess()",
+            "    testSuccess()"
         );
         String compiled = compiledLua("erasedGenericPrimitiveDefaultsAreNormalizedAtConcreteUse");
         assertTrue("concrete generic use must normalize an erased integer",