Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backout changes for bug 196461, due to startup crash on win32

Browse Source
This commit is contained in:
jrgm%netscape.com 2003-03-09 05:57:23 +00:00
parent 73a99565bc
commit b14fbf087b
4 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/jsapi.c
View File

@ -1518,7 +1518,6 @@ JS_ClearNewbornRoots(JSContext *cx)
for (i = 0; i < GCX_NTYPES; i++)
cx->newborn[i] = NULL;
cx->lastAtom = NULL;
}
#include "jshash.h" /* Added by JSIFY */

3
js/src/jsatom.c
View File

@ -459,7 +459,6 @@ js_AtomizeHashedKey(JSContext *cx, jsval key, JSHashNumber keyHash, uintN flags)
atom = (JSAtom *)he;
atom->flags |= flags;
cx->lastAtom = atom;
out:
JS_UNLOCK(&state->lock,cx);
return atom;
@ -550,7 +549,6 @@ js_AtomizeDouble(JSContext *cx, jsdouble d, uintN flags)
atom = (JSAtom *)he;
atom->flags |= flags;
cx->lastAtom = atom;
out:
JS_UNLOCK(&state->lock,cx);
return atom;
@ -613,7 +611,6 @@ js_AtomizeString(JSContext *cx, JSString *str, uintN flags)
atom = (JSAtom *)he;
atom->flags |= flags & (ATOM_PINNED | ATOM_INTERNED);
cx->lastAtom = atom;
out:
JS_UNLOCK(&state->lock,cx);
return atom;

3
js/src/jscntxt.h
View File

@ -317,9 +317,6 @@ struct JSContext {
/* Most recently created things by type, members of the GC's root set. */
JSGCThing *newborn[GCX_NTYPES];
/* Atom root for the last-looked-up atom on this context. */
JSAtom *lastAtom;
/* Regular expression class statics (XXX not shared globally). */
JSRegExpStatics regExpStatics;

5
js/src/jsgc.c
View File

@ -759,7 +759,7 @@ gc_dump_thing(JSGCThing *thing, uint8 flags, GCMarkNode *prev, FILE *fp)
? NULL
: JSVAL_TO_PRIVATE(privateValue);
const char *className = gc_object_class_name(thing);
fprintf(fp, "object %8p %s", privateThing, className);
fprintf(fp, "object %08p %s", privateThing, className);
break;
}
case GCX_DOUBLE:
@ -989,7 +989,6 @@ js_ForceGC(JSContext *cx, uintN gcflags)
for (i = 0; i < GCX_NTYPES; i++)
cx->newborn[i] = NULL;
cx->lastAtom = NULL;
cx->runtime->gcPoke = JS_TRUE;
js_GC(cx, gcflags);
JS_ArenaFinish();
@ -1262,8 +1261,6 @@ restart:
NULL);
for (i = GCX_EXTERNAL_STRING; i < GCX_NTYPES; i++)
GC_MARK(cx, acx->newborn[i], "newborn external string", NULL);
if (acx->lastAtom)
GC_MARK_ATOM(cx, acx->lastAtom, NULL);
#if JS_HAS_EXCEPTIONS
if (acx->throwing && JSVAL_IS_GCTHING(acx->exception))
GC_MARK(cx, JSVAL_TO_GCTHING(acx->exception), "exception", NULL);