Bug 1294013 - Replace parseResumptionValueHelper with processResumpti…

…onValue in handleUncaughtException. r=jimb
thebnich · Aug 17, 2016 · 6d0ac1e · 6d0ac1e
1 parent aa37c5c
commit 6d0ac1e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
@@ -1339,8 +1339,13 @@ Debugger::handleUncaughtExceptionHelper(Maybe<AutoCompartment>& ac,
             RootedValue fval(cx, ObjectValue(*uncaughtExceptionHook));
             RootedValue rv(cx);
             if (js::Call(cx, fval, object, exc, &rv)) {
-                return vp ? parseResumptionValueHelper(ac, true, rv, thisVForCheck, frame, *vp, false)
-                          : JSTRAP_CONTINUE;
+                if (vp) {
+                    JSTrapStatus status = JSTRAP_CONTINUE;
+                    if (processResumptionValue(ac, frame, thisVForCheck, rv, &status, *vp))
+                        return status;
+                } else {
+                    return JSTRAP_CONTINUE;
+                }
             }
         }