Preserve one-shot optimizer cleanup

Author: Frotty

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

@@ -39,6 +39,8 @@ public class ImOptimizer {
         localPasses.add(new GlobalsInliner());
         localPasses.add(new DispatchCheckDeduplicator());
         localPasses.add(new SimpleRewrites());
+        localPasses.add(new LocalMerger());
+        localPasses.add(new DispatchCheckDeduplicator());
     }
 
     private final TimeTaker timeTaker;

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

@@ -2293,7 +2293,12 @@ public void luaInlinerReusesRegistersAcrossSequentialInlineSites() {
             false, Collections.emptyList(),
             new RunArgs().with("-lua", "-inline", "-localOptimizations"),
             lines.toArray(new String[0]));
-        String callerBody = getFunctionBody(compiled, "caller");
+        int callerStart = compiled.indexOf("function caller(");
+        assertTrue("caller function not found", callerStart >= 0);
+        int callerBodyStart = compiled.indexOf('\n', callerStart);
+        int callerEnd = compiled.indexOf("\nend", callerBodyStart);
+        assertTrue("caller function end not found", callerEnd > callerBodyStart);
+        String callerBody = compiled.substring(callerBodyStart + 1, callerEnd);
         assertFalse("low-pressure sequential helper calls should still inline:\n" + callerBody,
             callerBody.contains("helper("));
         assertFalse("sequential inline temporaries should reuse registers:\n" + callerBody,

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

@@ -1632,7 +1632,7 @@ public <T> T measure(String name, java.util.function.Supplier<T> f) {
 
         new ImOptimizer(timeTaker, translator).localOptimizations();
 
-        assertEquals(timeTaker.measurements, 8,
+        assertEquals(timeTaker.measurements, 10,
             "the optimizer should run each configured local pass exactly once per invocation");
     }