Bug 701274: Make jsd_ThrowHandler return the proper JSTrapStatus value, not JSD_HOOK_RETURN_CONTINUE_THROW. r=sfink
authorJim Blandy <jimb@mozilla.com>
Tue, 15 Nov 2011 08:04:58 -0800
changeset 80288 26e489b81e7ff3195bc40bacc531ffd60e127584
parent 80287 639b9381a8080b2790c72cda1e04f3d4affc05d6
child 80289 97334042d5008811acd27e0febe1c93f88000fc1
push id323
push userrcampbell@mozilla.com
push dateTue, 15 Nov 2011 21:58:36 +0000
treeherderfx-team@3ea216303184 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssfink
bugs701274
milestone11.0a1
Bug 701274: Make jsd_ThrowHandler return the proper JSTrapStatus value, not JSD_HOOK_RETURN_CONTINUE_THROW. r=sfink
js/jsd/jsd_hook.c
--- a/js/jsd/jsd_hook.c
+++ b/js/jsd/jsd_hook.c
@@ -119,34 +119,34 @@ jsd_ThrowHandler(JSContext *cx, JSScript
                  jsval *rval, void *closure)
 {
     JSDScript*      jsdscript;
     JSDContext*     jsdc = (JSDContext*) closure;
     JSD_ExecutionHookProc hook;
     void*                 hookData;
 
     if( ! jsdc || ! jsdc->inited )
-        return JSD_HOOK_RETURN_CONTINUE_THROW;
+        return JSTRAP_CONTINUE;
 
     if( JSD_IS_DANGEROUS_THREAD(jsdc) )
-        return JSD_HOOK_RETURN_CONTINUE_THROW;
+        return JSTRAP_CONTINUE;
 
     /* local in case jsdc->throwHook gets cleared on another thread */
     JSD_LOCK();
     hook     = jsdc->throwHook;
     hookData = jsdc->throwHookData;
     JSD_UNLOCK();
     if (!hook)
-        return JSD_HOOK_RETURN_CONTINUE_THROW;
+        return JSTRAP_CONTINUE;
 
     JSD_LOCK_SCRIPTS(jsdc);
     jsdscript = jsd_FindOrCreateJSDScript(jsdc, cx, script, NULL);
     JSD_UNLOCK_SCRIPTS(jsdc);
     if( ! jsdscript )
-        return JSD_HOOK_RETURN_CONTINUE_THROW;
+        return JSTRAP_CONTINUE;
 
     JS_GetPendingException(cx, rval);
 
     return jsd_CallExecutionHook(jsdc, cx, JSD_HOOK_THROW,
                                  hook, hookData, rval);
 }
 
 JSTrapStatus