From 75943ec976070106c30bfcc4131fcff74097075a Mon Sep 17 00:00:00 2001 From: "igor%mir2.org" Date: Sat, 4 Aug 2007 18:59:21 +0000 Subject: [PATCH] Bug 390348: pinning of JSAtomState.emptyAtom is restored. r=brendan git-svn-id: svn://10.0.0.236/trunk@231485 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/src/jsatom.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/mozilla/js/src/jsatom.c b/mozilla/js/src/jsatom.c index 3fe1c58b939..8df02aa2f25 100644 --- a/mozilla/js/src/jsatom.c +++ b/mozilla/js/src/jsatom.c @@ -279,29 +279,19 @@ js_InitAtomState(JSContext *cx, JSAtomState *state) return JS_TRUE; } -static JSAtom * -AtomizeHashedKey(JSContext *cx, jsval key, JSHashNumber keyHash); - JSBool js_InitPinnedAtoms(JSContext *cx, JSAtomState *state) { - JSString *empty; uintN i; - empty = js_NewStringCopyN(cx, js_empty_ucstr, 0); - if (!empty) - return JS_FALSE; - JS_ASSERT(js_HashString(empty) == 0); - state->emptyAtom = AtomizeHashedKey(cx, STRING_TO_JSVAL(empty), 0); - if (!state->emptyAtom) - return JS_FALSE; - #define FROB(lval,str) \ JS_BEGIN_MACRO \ if (!(state->lval = js_Atomize(cx, str, strlen(str), ATOM_PINNED))) \ return JS_FALSE; \ JS_END_MACRO + FROB(emptyAtom, ""); + for (i = 0; i < JSTYPE_LIMIT; i++) FROB(typeAtoms[i], js_type_strs[i]);