Skip to content

Commit 915f996

Browse files
committed
[MERGE #792] Clear disable implicit call flag when dispatching exception to debugger
Merge pull request #792 from Cellule:exception When dispatching the exception to the debugger, make sure we call `ClearDisableImplicitFlags()`
2 parents e2ff450 + 4116a3f commit 915f996

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

lib/Runtime/Language/JavascriptExceptionOperators.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -839,11 +839,6 @@ namespace Js
839839
WalkStackForExceptionContext(*scriptContext, exceptionContext, thrownObject, StackCrawlLimitOnThrow(thrownObject, *scriptContext), returnAddress, /*isThrownException=*/ true, resetStack);
840840
exceptionObject->FillError(exceptionContext, scriptContext);
841841
AddStackTraceToObject(thrownObject, exceptionContext.GetStackTrace(), *scriptContext, /*isThrownException=*/ true, resetStack);
842-
843-
if (considerPassingToDebugger)
844-
{
845-
DispatchExceptionToDebugger(exceptionObject, scriptContext);
846-
}
847842
}
848843
Assert(!scriptContext ||
849844
// If we disabled implicit calls and we did record an implicit call, do not throw.
@@ -856,6 +851,10 @@ namespace Js
856851
!scriptContext->GetThreadContext()->IsDisableImplicitException()
857852
);
858853
scriptContext->GetThreadContext()->ClearDisableImplicitFlags();
854+
if (fillExceptionContext && considerPassingToDebugger)
855+
{
856+
DispatchExceptionToDebugger(exceptionObject, scriptContext);
857+
}
859858
}
860859

861860
if (exceptionObject->IsPendingExceptionObject())

0 commit comments

Comments
 (0)