Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1337578 - Mark atoms when cloning functions r=bhackett

Browse Source
This commit is contained in:
Jon Coppeard 2017-04-12 10:00:45 +01:00
parent 1797b2399a
commit 93196961b0
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jsfun.cpp
View File

@ -2084,7 +2084,11 @@ NewFunctionClone(JSContext* cx, HandleFunction fun, NewObjectKind newKind,
clone->setArgCount(fun->nargs());
clone->setFlags(flags);
clone->initAtom(fun->displayAtom());
JSAtom* atom = fun->displayAtom();
if (atom)
cx->markAtom(atom);
clone->initAtom(atom);
if (allocKind == AllocKind::FUNCTION_EXTENDED) {
if (fun->isExtended() && fun->compartment() == cx->compartment()) {

10
js/src/jsfun.h
View File

@ -321,9 +321,15 @@ class JSFunction : public js::NativeObject
return hasGuessedAtom() ? nullptr : atom_.get();
}
void initAtom(JSAtom* atom) { atom_.init(atom); }
void initAtom(JSAtom* atom) {
MOZ_ASSERT_IF(atom, js::AtomIsMarked(zone(), atom));
atom_.init(atom);
}
void setAtom(JSAtom* atom) { atom_ = atom; }
void setAtom(JSAtom* atom) {
MOZ_ASSERT_IF(atom, js::AtomIsMarked(zone(), atom));
atom_ = atom;
}
JSAtom* displayAtom() const {
return atom_;

2
js/src/jsscript.cpp
View File

@ -3256,6 +3256,8 @@ CloneInnerInterpretedFunction(JSContext* cx, HandleScope enclosingScope, HandleF
flags |= JSFunction::Flags::EXTENDED;
}
RootedAtom atom(cx, srcFun->displayAtom());
if (atom)
cx->markAtom(atom);
RootedFunction clone(cx, NewFunctionWithProto(cx, nullptr, srcFun->nargs(),
JSFunction::Flags(flags), nullptr, atom,
cloneProto, allocKind, TenuredObject));