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

Merge from tracemonkey to jsdbg2. This merge reveals a bug in DebugFrame_getOlder, to be fixed separately.

Browse Source
This commit is contained in:
Jason Orendorff
2011-05-16 17:50:52 -05:00
parent 4eb862ea3a 5b10b57ade
commit b2324842ed
3731 changed files with 53627 additions and 177197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
js/src/jsatom.cpp
View File

@@ -461,11 +461,14 @@ js_SweepAtomState(JSContext *cx)
}
/*
* This call takes ownership of 'chars' if ATOM_NOCOPY is set.
* Callers passing ATOM_NOCOPY have freshly allocated *pchars and thus this
* memory can be used as a new JSAtom's buffer without copying. When this flag
* is set, the contract is that callers will free *pchars iff *pchars == NULL.
*/
static JSAtom *
Atomize(JSContext *cx, const jschar *chars, size_t length, uintN flags)
Atomize(JSContext *cx, const jschar **pchars, size_t length, uintN flags)
{
const jschar *chars = *pchars;
JS_ASSERT(!(flags & ~(ATOM_PINNED|ATOM_INTERNED|ATOM_NOCOPY)));
if (JSAtom *s = JSAtom::lookupStatic(chars, length))
@@ -485,10 +488,9 @@ Atomize(JSContext *cx, const jschar *chars, size_t length, uintN flags)
JSFixedString *key;
if (flags & ATOM_NOCOPY) {
key = js_NewString(cx, const_cast<jschar *>(chars), length);
if (!key) {
cx->free_(const_cast<jschar *>(chars));
if (!key)
return NULL;
}
*pchars = NULL; /* Caller should not free *pchars. */
} else {
key = js_NewStringCopyN(cx, chars, length);
if (!key)
@@ -526,7 +528,7 @@ js_AtomizeString(JSContext *cx, JSString *str, uintN flags)
return NULL;
JS_ASSERT(length <= JSString::MAX_LENGTH);
return Atomize(cx, chars, length, flags);
return Atomize(cx, &chars, length, flags);
}
JSAtom *
@@ -565,7 +567,10 @@ js_Atomize(JSContext *cx, const char *bytes, size_t length, uintN flags, bool us
flags |= ATOM_NOCOPY;
}
return Atomize(cx, chars, inflatedLength, flags);
JSAtom *atom = Atomize(cx, &chars, inflatedLength, flags);
if ((flags & ATOM_NOCOPY) && chars)
cx->free_((void *)chars);
return atom;
}
JSAtom *
@@ -577,7 +582,7 @@ js_AtomizeChars(JSContext *cx, const jschar *chars, size_t length, uintN flags)
if (!CheckStringLength(cx, length))
return NULL;
return Atomize(cx, chars, length, flags);
return Atomize(cx, &chars, length, flags);
}
JSAtom *