Commit 23878831 authored by Logan Smyth's avatar Logan Smyth
Browse files

Bug 1602429 - Part 3: Centralize leaveDebugger calls. r=jimb 

This avoids duplicating logic between processParsedHandlerResult and
processHandlerResult since both are quite similar.

Differential Revision: https://phabricator.services.mozilla.com/D57930

--HG--
extra : moz-landing-system : lando
parent dc44f791

js/src/debugger/Debugger.cpp

+3 −8
Original line number Original line Diff line number Diff line
@@ -1829,17 +1829,12 @@ ResumeMode Debugger::processHandlerResult(Maybe<AutoRealm>& ar, bool success, 
                                          MutableHandleValue vp) {

                                          MutableHandleValue vp) {

  JSContext* cx = ar->context();

  JSContext* cx = ar->context();





  if (!success) {

    return handleUncaughtException(ar, vp, frame, pc);

  }



  RootedValue rootRv(cx, rv);

  RootedValue rootRv(cx, rv);

  ResumeMode resumeMode = ResumeMode::Continue;

  ResumeMode resumeMode = ResumeMode::Continue;

  if (!ParseResumptionValue(cx, rootRv, resumeMode, vp)) {

  if (success) {

    return handleUncaughtException(ar, vp, frame, pc);

    success = ParseResumptionValue(cx, rootRv, resumeMode, vp);

  }

  }

  return leaveDebugger(ar, frame, pc, CallUncaughtExceptionHook::Yes,

  return processParsedHandlerResult(ar, frame, pc, success, resumeMode, vp);

                       resumeMode, vp);

}

}





/*** Debuggee completion values *********************************************/

/*** Debuggee completion values *********************************************/