Merge remote-tracking branch 'stof/clean_callstack'

scssphp · Apr 20, 2020 · 52c8b7d · 52c8b7d
2 parents 5b898b7 + c3a80d7
commit 52c8b7d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/Compiler.php b/src/Compiler.php
@@ -1891,6 +1891,7 @@ protected function compileChildren($stms, OutputBlock $out, $traceName = '')
             $ret = $this->compileChild($stm, $out);
 
             if (isset($ret)) {
+                $this->popCallStack();
                 return $ret;
             }
         }
@@ -1929,6 +1930,7 @@ protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent
 
             if (isset($ret)) {
                 $this->throwError('@return may only be used within a function');
+                $this->popCallStack();
 
                 return;
             }