Skip to content

Commit 789ab36

Browse files
committed
[MERGE #3526 @sigatrev] OS#9030969 fix stack trace with jitted loops
Merge pull request #3526 from sigatrev:StackWalkLoops native code address was being cleared more often than it should causing the trace to use the line/column numbers of the last bytecode instruction executed which is not where the error occurs if it was during jitted code.
2 parents a4f0672 + e9570fb commit 789ab36

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

lib/Runtime/Language/JavascriptStackWalker.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -537,11 +537,7 @@ namespace Js
537537
{
538538
this->previousInterpreterFrameIsForLoopBody = true;
539539
}
540-
else
541540
#endif
542-
{
543-
this->previousInterpreterFrameIsForLoopBody = false;
544-
}
545541

546542
// We might've bailed out of an inlinee, so check if there were any inlinees.
547543
if (this->interpreterFrame->GetFlags() & InterpreterStackFrameFlags_FromBailOut)
@@ -678,6 +674,7 @@ namespace Js
678674
#if ENABLE_NATIVE_CODEGEN
679675
if (lastInternalFrameInfo.codeAddress != nullptr && this->previousInterpreterFrameIsForLoopBody)
680676
{
677+
this->previousInterpreterFrameIsForLoopBody = false;
681678
ClearCachedInternalFrameInfo();
682679
}
683680

0 commit comments

Comments
 (0)