tests

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/translation/imoptimizer/ImInliner.java

@@ -270,8 +270,10 @@ private ImStmt rewriteStmtForEarlyReturn(ImStmt s, ImVar doneVar, ImVar retVar)
     }
 
     private void rateInlinableFunctions() {
-        for (Map.Entry<ImFunction, ImFunction> f : translator.getCalledFunctions().entries()) {
-            incCallCount(f.getKey());
+        for (Map.Entry<ImFunction, ImFunction> edge : translator.getCalledFunctions().entries()) {
+            // For bloat control we need how often a function is used (incoming edges),
+            // not how many calls it performs itself (outgoing edges).
+            incCallCount(edge.getValue());
         }
         for (ImFunction f : inlinableFunctions) {
             int size = estimateSize(f);

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

@@ -899,7 +899,7 @@ public void testInlineAnnotation() throws IOException {
         String inlined = Files.toString(new File("test-output/OptimizerTests_testInlineAnnotation_inl.j"), Charsets.UTF_8);
         assertFalse(inlined.contains("function bar"));
         assertFalse(inlined.contains("function over9000"));
-        assertTrue(inlined.contains("function over9001"));
+        // Non-annotated over9001 may be inlined depending on heuristic tuning.
         assertTrue(inlined.contains("function noot"));
     }
 
@@ -925,6 +925,53 @@ public void inlinerSupportsMultiReturn() throws IOException {
             "Expected multi-return function calls to be inlined in _inl output.");
     }
 
+    @Test
+    public void inlinerRatesByIncomingUsesNotOutgoingCalls() throws IOException {
+        testAssertOkLinesWithStdLib(false,
+            "package test",
+            "function h1(int x) returns int",
+            "    return x + 1",
+            "function h2(int x) returns int",
+            "    return x + 2",
+            "function h3(int x) returns int",
+            "    return x + 3",
+            "function h4(int x) returns int",
+            "    return x + 4",
+            "function wrapper(int x) returns int",
+            "    var a = h1(x)",
+            "    var b = h2(a)",
+            "    var c = h3(b)",
+            "    var d = h4(c)",
+            "    if d > 0",
+            "        d += 1",
+            "    if d > 10",
+            "        d += 2",
+            "    if d > 20",
+            "        d += 3",
+            "    if d > 30",
+            "        d += 4",
+            "    if d > 40",
+            "        d += 5",
+            "    if d > 50",
+            "        d += 6",
+            "    if d > 60",
+            "        d += 7",
+            "    if d > 70",
+            "        d += 8",
+            "    return d",
+            "init",
+            "    let v = wrapper(GetRandomInt(1, 100))",
+            "    if v > 0",
+            "        testSuccess()",
+            "endpackage"
+        );
+        String inlined = Files.toString(new File("test-output/OptimizerTests_inlinerRatesByIncomingUsesNotOutgoingCalls_inl.j"), Charsets.UTF_8);
+        assertFalse(inlined.contains("call wrapper"),
+            "Expected wrapper to inline when it has one incoming use.");
+        assertTrue(inlined.contains("GetRandomInt("),
+            "Expected test setup to remain non-constant and observable in _inl output.");
+    }
+
 
     @Test
     public void moveTowardsBug() { // see #737