Bug 483847 - Remove bogo-assertion (and fix compilation warning). r=Waldo a=sayrer
authorBlake Kaplan <mrbkap@gmail.com>
Thu, 02 Apr 2009 15:01:15 -0700
changeset 25920 c1a7081602682ef4e631355439992bde010d374e
parent 25919 57cab9f9262df59da0cd455b428501b7ca717237
child 25921 9732452737d87c69c8bf5daa3bb469e5ffda054c
push id1672
push usermrbkap@mozilla.com
push dateTue, 09 Jun 2009 18:22:33 +0000
reviewersWaldo, sayrer
bugs483847
milestone1.9.1pre
Bug 483847 - Remove bogo-assertion (and fix compilation warning). r=Waldo a=sayrer
js/jsd/jsd_scpt.c
--- a/js/jsd/jsd_scpt.c
+++ b/js/jsd/jsd_scpt.c
@@ -294,17 +294,17 @@ jsd_FindOrCreateJSDScript(JSDContext    
 {
     JSDScript *jsdscript;
     JS_ASSERT(JSD_SCRIPTS_LOCKED(jsdc));
 
     jsdscript = jsd_FindJSDScript(jsdc, script);
     if (jsdscript)
         return jsdscript;
 
-    // Fallback for unknown scripts: create a new script
+    /* Fallback for unknown scripts: create a new script. */
     if (!fp)
         JS_FrameIterator(cx, &fp);
     if (fp)
         jsdscript = _newJSDScript(jsdc, cx, script, JS_GetFrameFunction(cx, fp));
 
     return jsdscript;
 }
 
@@ -820,17 +820,16 @@ jsd_ClearExecutionHook(JSDContext*      
 {
     JSDExecHook* jsdhook;
 
     JSD_LOCK();
 
     jsdhook = _findHook(jsdc, jsdscript, pc);
     if( ! jsdhook )
     {
-        JS_ASSERT(0);
         JSD_UNLOCK();
         return JS_FALSE;
     }
 
     JS_ClearTrap(jsdc->dumbContext, jsdscript->script, 
                  (jsbytecode*)pc, NULL, NULL );
 
     JS_REMOVE_LINK(&jsdhook->links);