corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from mozilla-central to jsdbg2 branch.

Browse Source
This commit is contained in:
Jason Orendorff
2011-07-27 18:23:16 -05:00
parent 7fd776e35c 360ba9b39e
commit 0a46d5195d
1109 changed files with 333546 additions and 20347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
js/src/jsatom.cpp
View File

@@ -347,7 +347,7 @@ js_FinishAtomState(JSRuntime *rt)
}
for (AtomSet::Range r = state->atoms.all(); !r.empty(); r.popFront())
r.front().toAtom()->finalize(rt);
r.front().asPtr()->finalize(rt);
#ifdef JS_THREADSAFE
js_FinishLock(&state->lock);
@@ -391,16 +391,16 @@ js_TraceAtomState(JSTracer *trc)
if (rt->gcKeepAtoms) {
for (AtomSet::Range r = state->atoms.all(); !r.empty(); r.popFront()) {
JS_SET_TRACING_INDEX(trc, "locked_atom", number++);
MarkString(trc, r.front().toAtom());
MarkString(trc, r.front().asPtr());
}
} else {
for (AtomSet::Range r = state->atoms.all(); !r.empty(); r.popFront()) {
AtomStateEntry entry = r.front();
if (!entry.isInterned())
if (!entry.isTagged())
continue;
JS_SET_TRACING_INDEX(trc, "interned_atom", number++);
MarkString(trc, entry.toAtom());
MarkString(trc, entry.asPtr());
}
}
}
@@ -413,13 +413,13 @@ js_SweepAtomState(JSContext *cx)
for (AtomSet::Enum e(state->atoms); !e.empty(); e.popFront()) {
AtomStateEntry entry = e.front();
if (entry.isInterned()) {
if (entry.isTagged()) {
/* Pinned or interned key cannot be finalized. */
JS_ASSERT(!IsAboutToBeFinalized(cx, entry.toAtom()));
JS_ASSERT(!IsAboutToBeFinalized(cx, entry.asPtr()));
continue;
}
if (IsAboutToBeFinalized(cx, entry.toAtom()))
if (IsAboutToBeFinalized(cx, entry.asPtr()))
e.removeFront();
}
}
@@ -435,24 +435,7 @@ AtomIsInterned(JSContext *cx, JSAtom *atom)
if (!p)
return false;
return p->isInterned();
}
/*
* This call takes ownership of 'chars' if ATOM_NOCOPY is set.
* Non-branching code sequence to put the intern flag on |entryRef| if
* |intern| is true.
*
* Conceptually, we have compressed a HashMap<JSAtom *, uint> into a
* HashMap<size_t>. Here, we promise that we are only changing the "value" of
* the HashMap entry, so the const_cast is safe.
*/
static void
MakeInterned(const AutoLockAtomsCompartment &, const AtomStateEntry &entryRef, InternBehavior ib)
{
AtomStateEntry *entry = const_cast<AtomStateEntry *>(&entryRef);
AtomStateEntry::makeInterned(entry, ib);
JS_ASSERT(InternBehavior(entryRef.isInterned()) >= ib);
return p->isTagged();
}
enum OwnCharsBehavior
@@ -482,8 +465,8 @@ AtomizeInline(JSContext *cx, const jschar **pchars, size_t length,
AtomSet::AddPtr p = atoms.lookupForAdd(AtomHasher::Lookup(chars, length));
if (p) {
JSAtom *atom = p->toAtom();
MakeInterned(lock, *p, ib);
JSAtom *atom = p->asPtr();
p->setTagged(bool(ib));
return atom;
}
@@ -512,7 +495,7 @@ AtomizeInline(JSContext *cx, const jschar **pchars, size_t length,
* collision!
*/
AtomHasher::Lookup lookup(chars, length);
if (!atoms.relookupOrAdd(p, lookup, AtomStateEntry(key, ib))) {
if (!atoms.relookupOrAdd(p, lookup, AtomStateEntry((JSAtom *) key, bool(ib)))) {
JS_ReportOutOfMemory(cx); /* SystemAllocPolicy does not report */
return NULL;
}
@@ -542,9 +525,9 @@ js_AtomizeString(JSContext *cx, JSString *str, InternBehavior ib)
AtomSet &atoms = cx->runtime->atomState.atoms;
AtomSet::Ptr p = atoms.lookup(AtomHasher::Lookup(&atom));
JS_ASSERT(p); /* Non-static atom must exist in atom state set. */
JS_ASSERT(p->toAtom() == &atom);
JS_ASSERT(p->asPtr() == &atom);
JS_ASSERT(ib == InternAtom);
MakeInterned(lock, *p, ib);
p->setTagged(bool(ib));
return &atom;
}
@@ -620,7 +603,7 @@ js_GetExistingStringAtom(JSContext *cx, const jschar *chars, size_t length)
return atom;
AutoLockAtomsCompartment lock(cx);
AtomSet::Ptr p = cx->runtime->atomState.atoms.lookup(AtomHasher::Lookup(chars, length));
return p ? p->toAtom() : NULL;
return p ? p->asPtr() : NULL;
}
#ifdef DEBUG
@@ -634,9 +617,9 @@ js_DumpAtoms(JSContext *cx, FILE *fp)
for (AtomSet::Range r = state->atoms.all(); !r.empty(); r.popFront()) {
AtomStateEntry entry = r.front();
fprintf(fp, "%3u ", number++);
JSAtom *key = entry.toAtom();
JSAtom *key = entry.asPtr();
FileEscapedString(fp, key, '"');
if (entry.isInterned())
if (entry.isTagged())
fputs(" interned", fp);
putc('\n', fp);
}