Merge cvs-trunk-mirror -> mozilla-central

2008-03-10 17:07:41 -04:00
parent 1bbcf22fe2 2e5e5114ee
commit f49c72da2c
432 changed files with 9666 additions and 3252 deletions
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -5100,7 +5100,7 @@ ReconstructPCStack(JSContext *cx, JSScript *script, jsbytecode *pc,
            ndefs = OBJ_BLOCK_COUNT(cx, obj);
        }

-        LOCAL_ASSERT(pcdepth + ndefs <= script->depth);
+        LOCAL_ASSERT((uintN)(pcdepth + ndefs) <= script->depth);
        if (pcstack) {
            intN i;
            jsbytecode *pc2;