fix

Author: Frotty

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

@@ -380,21 +380,14 @@ private void rewriteFuncRefs(final List<ImFuncRefOrCall> funcRefs, Set<ImFunctio
             ImExprs args = JassIm.ImExprs(str);
             ImStmts body = bridgeFunc.getBody();
             de.peeeq.wurstscript.ast.Element trace = frTrace;
-            ImVar savedStackDepth = JassIm.ImVar(trace, TypesHelper.imInt(), "bridge_oldStackDepth", false);
-            bridgeFunc.getLocals().add(savedStackDepth);
-            body.add(JassIm.ImSet(trace, JassIm.ImVarAccess(savedStackDepth), JassIm.ImVarAccess(stackSize)));
-            // reset stack and add information for callback:
-            body.add(JassIm.ImSet(trace, JassIm.ImVarAccess(stackSize), JassIm.ImIntVal(0)));
 
             ImFunctionCall call = JassIm.ImFunctionCall(frTrace, f, JassIm.ImTypeArguments(), args, true, CallType.NORMAL);
             if (bridgeFunc.getReturnType() instanceof ImVoid) {
-                body.add(call);
-                stmt = JassIm.ImSet(trace, JassIm.ImVarAccess(stackSize), JassIm.ImVarAccess(savedStackDepth));
+                stmt = call;
             } else {
                 ImVar bridgeReturn = JassIm.ImVar(trace, bridgeFunc.getReturnType().copy(), "bridge_return", false);
                 bridgeFunc.getLocals().add(bridgeReturn);
                 body.add(JassIm.ImSet(trace, JassIm.ImVarAccess(bridgeReturn), call));
-                body.add(JassIm.ImSet(trace, JassIm.ImVarAccess(stackSize), JassIm.ImVarAccess(savedStackDepth)));
                 stmt = JassIm.ImReturn(frTrace, JassIm.ImVarAccess(bridgeReturn));
             }
             body.add(stmt);

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

@@ -1465,7 +1465,7 @@ public void executeFuncWithStackTrace() {
     }
 
     @Test
-    public void executeFuncBridgeRestoresStackDepth() {
+    public void executeFuncBridgeKeepsCallerStackFrames() {
         test().executeProg(false).executeTests(false).lines(
             "package Test",
             "@extern native ExecuteFunc(string f)",
@@ -1483,13 +1483,13 @@ public void executeFuncBridgeRestoresStackDepth() {
 
         try {
             String jass = Files.toString(
-                new File(TEST_OUTPUT_PATH + "BugTests_executeFuncBridgeRestoresStackDepth_stacktraceinlopt.j"),
+                new File(TEST_OUTPUT_PATH + "BugTests_executeFuncBridgeKeepsCallerStackFrames_stacktraceinlopt.j"),
                 Charsets.UTF_8
             );
             Assert.assertTrue(jass.contains("function bridge_foo"));
-            Assert.assertTrue(jass.contains("bridge_oldStackDepth"));
-            Assert.assertTrue(jass.contains("set wurst_stack_depth = 0"));
-            Assert.assertTrue(jass.contains("set wurst_stack_depth = bridge_oldStackDepth"));
+            Assert.assertFalse(jass.contains("bridge_oldStackDepth"));
+            Assert.assertFalse(jass.contains("set wurst_stack_depth = 0"));
+            Assert.assertTrue(jass.contains("via ExecuteFunc"));
         } catch (IOException e) {
             throw new RuntimeException(e);
         }