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

Bug 885300 - don't inline js::ToAtom. r=nnethercote

Browse Source
This commit is contained in:
Till Schneidereit
2013-06-21 02:59:39 +02:00
parent e19b0d18ef
commit 1f3d13b5e2
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
js/src/jsatom.cpp
View File

@@ -432,6 +432,32 @@ js::IndexToIdSlow<CanGC>(JSContext *cx, uint32_t index, MutableHandleId idp);
template bool
js::IndexToIdSlow<NoGC>(JSContext *cx, uint32_t index, FakeMutableHandle<jsid> idp);
template <AllowGC allowGC>
JSAtom *
js::ToAtom(JSContext *cx, typename MaybeRooted<Value, allowGC>::HandleType v)
{
if (!v.isString()) {
JSString *str = js::ToStringSlow<allowGC>(cx, v);
if (!str)
return NULL;
JS::Anchor<JSString *> anchor(str);
return AtomizeString<allowGC>(cx, str);
}
JSString *str = v.toString();
if (str->isAtom())
return &str->asAtom();
JS::Anchor<JSString *> anchor(str);
return AtomizeString<allowGC>(cx, str);
}
template JSAtom *
js::ToAtom<CanGC>(JSContext *cx, HandleValue v);
template JSAtom *
js::ToAtom<NoGC>(JSContext *cx, Value v);
template<XDRMode mode>
bool
js::XDRAtom(XDRState<mode> *xdr, MutableHandleAtom atomp)