Normalize erased generic statement block results

Author: Frotty

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

@@ -945,8 +945,11 @@ public static ImExpr translate(ExprStatementsBlock e, ImTranslator translator, I
 
         StmtReturn r = e.getReturnStmt();
         if (r != null && r.getReturnedObj() instanceof Expr) {
-            ImExpr expr = ((Expr) r.getReturnedObj()).imTranslateExpr(translator, f);
-            return JassIm.ImStatementExpr(statements, expr);
+            Expr returnedExpr = (Expr) r.getReturnedObj();
+            ImExpr expr = returnedExpr.imTranslateExpr(translator, f);
+            expr = wrapTranslation(e, translator, expr, returnedExpr.attrTypRaw(), e.attrExpectedTypRaw());
+            return wrapTranslation(e, translator, JassIm.ImStatementExpr(statements, expr),
+                e.attrTypRaw(), e.attrExpectedTypRaw());
         } else {
             return ImHelper.statementExprVoid(statements);
         }

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

@@ -2248,6 +2248,28 @@ public void erasedGenericPrimitiveDefaultsAreNormalizedInTypedClosures() throws
             compiled.contains("return __wurst_ensureInt(Box_Box_get("));
     }
 
+    @Test
+    public void erasedGenericPrimitiveDefaultsAreNormalizedInTypedStatementBlocks() throws IOException {
+        test().testLua(true).executeProg().lines(
+            "package Test",
+            "native testSuccess()",
+            "class Box<T:>",
+            "    T value",
+            "    function get() returns T",
+            "        return value",
+            "init",
+            "    let box = new Box<int>",
+            "    int value = begin",
+            "        return box.get()",
+            "    end",
+            "    if value + 1 == 1",
+            "        testSuccess()"
+        );
+        String compiled = compiledLua("erasedGenericPrimitiveDefaultsAreNormalizedInTypedStatementBlocks");
+        assertTrue("typed statement blocks must normalize erased primitive results",
+            compiled.contains("value = __wurst_ensureInt(Box_Box_get(box))"));
+    }
+
     /**
      * Seeded boundary corpus for the type-assurance change. Each case varies
      * the primitive type, literal value, and array slot while checking the two