Backed out changeset 0289f779f30b (bug 1294013)
authorIris Hsiao <ihsiao@mozilla.com>
Wed, 17 Aug 2016 18:50:24 +0800
changeset 309852 827512670fd6b9e5ae5724acf7d8c406e6dfde0d
parent 309851 97f275254cecdc54d07c68a8d0be263d90dbaa2c
child 309853 33c91255b886042253ff6afb5f25976c92e0a359
push id20333
push userkwierso@gmail.com
push dateThu, 18 Aug 2016 00:26:40 +0000
treeherderfx-team@11c94ec980d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1294013
milestone51.0a1
backs out0289f779f30b0187a93fd0441ce77c7120798788
Backed out changeset 0289f779f30b (bug 1294013)
js/src/vm/Debugger.cpp
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1334,23 +1334,18 @@ Debugger::handleUncaughtExceptionHelper(
             RootedValue exc(cx);
             if (!cx->getPendingException(&exc))
                 return JSTRAP_ERROR;
             cx->clearPendingException();
 
             RootedValue fval(cx, ObjectValue(*uncaughtExceptionHook));
             RootedValue rv(cx);
             if (js::Call(cx, fval, object, exc, &rv)) {
-                if (vp) {
-                    JSTrapStatus status = JSTRAP_CONTINUE;
-                    if (processResumptionValue(ac, frame, thisVForCheck, rv, &status, *vp))
-                        return status;
-                } else {
-                    return JSTRAP_CONTINUE;
-                }
+                return vp ? parseResumptionValueHelper(ac, true, rv, thisVForCheck, frame, *vp, false)
+                          : JSTRAP_CONTINUE;
             }
         }
 
         if (cx->isExceptionPending()) {
             /*
              * We want to report the pending exception, but we want to let the
              * embedding handle it however it wants to.  So pretend like we're
              * starting a new script execution on our current compartment (which