From 94bc8289e252df124ffcb35fd1e45e1a8461dba3 Mon Sep 17 00:00:00 2001 From: "igor%mir2.org" Date: Mon, 28 Jan 2008 22:36:59 +0000 Subject: [PATCH] Bug 413793: fixing JS compilation. r=outside of the browser three git-svn-id: svn://10.0.0.236/trunk@244252 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/src/js.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla/js/src/js.c b/mozilla/js/src/js.c index 87e41c7b412..45e6115eb07 100644 --- a/mozilla/js/src/js.c +++ b/mozilla/js/src/js.c @@ -1549,7 +1549,7 @@ DumpStats(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) uintN i; JSString *str; const char *bytes; - JSAtom *atom; + jsid id; JSObject *obj2; JSProperty *prop; jsval value; @@ -1558,6 +1558,7 @@ DumpStats(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) str = JS_ValueToString(cx, argv[i]); if (!str) return JS_FALSE; + argv[i] = STRING_TO_JSVAL(str); bytes = JS_GetStringBytes(str); if (strcmp(bytes, "arena") == 0) { #ifdef JS_ARENAMETER @@ -1568,14 +1569,13 @@ DumpStats(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) } else if (strcmp(bytes, "global") == 0) { DumpScope(cx, cx->globalObject, stdout); } else { - atom = js_Atomize(cx, bytes, JS_GetStringLength(str), 0); - if (!atom) + if (!JS_ValueToId(cx, STRING_TO_JSVAL(str), &id)) return JS_FALSE; - if (js_FindProperty(cx, ATOM_TO_JSID(atom), &obj, &obj2, &prop) < 0) + if (js_FindProperty(cx, id, &obj, &obj2, &prop) < 0) return JS_FALSE; if (prop) { OBJ_DROP_PROPERTY(cx, obj2, prop); - if (!OBJ_GET_PROPERTY(cx, obj, ATOM_TO_JSID(atom), &value)) + if (!OBJ_GET_PROPERTY(cx, obj, id, &value)) return JS_FALSE; } if (!prop || !JSVAL_IS_OBJECT(value)) {