Merge from CVS trunk to mozilla-central.

2007-09-17 10:17:44 -04:00
parent 29620ac628 8dbd76616b
commit 2ae1a7973b
184 changed files with 7881 additions and 2423 deletions
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -349,7 +349,7 @@ js_Disassemble1(JSContext *cx, JSScript *script, jsbytecode *pc,
      case JOF_SLOTOBJECT:
        fprintf(fp, " %u", GET_VARNO(pc));
        index = js_GetIndexFromBytecode(script, pc, VARNO_LEN);
-        if (type == JOF_ATOM) {
+        if (type == JOF_SLOTATOM) {
            JS_GET_SCRIPT_ATOM(script, index, atom);
            v = ATOM_KEY(atom);
        } else {