Backed out changeset 8e119f847f97 (build busted)

2010-11-11 11:19:42 -08:00
parent f73bb91440
commit 9ab38e165d
49 changed files with 574 additions and 794 deletions
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -417,11 +417,9 @@ GetCustomIterator(JSContext *cx, JSObject *obj, uintN flags, Value *vp)
         * We are always coming from js_ValueToIterator, and we are no longer on
         * trace, so the object we are iterating over is on top of the stack (-1).
         */
-        JSAutoByteString bytes;
-        if (!js_AtomToPrintableString(cx, atom, &bytes))
-            return false;
        js_ReportValueError2(cx, JSMSG_BAD_TRAP_RETURN_VALUE,
-                             -1, ObjectValue(*obj), NULL, bytes.ptr());
+                             -1, ObjectValue(*obj), NULL,
+                             js_AtomToPrintableString(cx, atom));
        return false;
    }
    return true;