wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1135827 - Don't root more times than necessary in js::SavedStacks::insertFrames. r=jimb

Browse Source
This commit is contained in:
Nick Fitzgerald 2015-02-24 10:35:00 +01:00
parent b17802c44c
commit 6b895feec3
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/vm/SavedStacks.cpp
View File

@ -78,7 +78,7 @@ class MOZ_STACK_CLASS SavedFrame::AutoLookupVector : public JS::CustomAutoRooter
typedef Vector<Lookup, 20> LookupVector;
inline LookupVector *operator->() { return &lookups; }
inline Lookup &operator[](size_t i) { return lookups[i]; }
inline HandleLookup operator[](size_t i) { return HandleLookup(lookups[i]); }
private:
LookupVector lookups;
@ -628,7 +628,7 @@ SavedStacks::insertFrames(JSContext *cx, FrameIter &iter, MutableHandleSavedFram
// actual SavedFrame instances.
RootedSavedFrame parentFrame(cx, nullptr);
for (size_t i = stackChain->length(); i != 0; i--) {
SavedFrame::AutoLookupRooter lookup(cx, &stackChain[i-1]);
SavedFrame::HandleLookup lookup = stackChain[i-1];
lookup->parent = parentFrame;
parentFrame.set(getOrCreateSavedFrame(cx, lookup));
if (!parentFrame)
@ -642,7 +642,7 @@ SavedStacks::insertFrames(JSContext *cx, FrameIter &iter, MutableHandleSavedFram
SavedFrame *
SavedStacks::getOrCreateSavedFrame(JSContext *cx, SavedFrame::HandleLookup lookup)
{
const SavedFrame::Lookup &lookupInstance = *lookup;
const SavedFrame::Lookup &lookupInstance = lookup.get();
DependentAddPtr<SavedFrame::Set> p(cx, frames, lookupInstance);
if (p)
return *p;

14
js/src/vm/SavedStacks.h
View File

@ -56,9 +56,21 @@ class SavedFrame : public NativeObject {
SystemAllocPolicy> Set;
typedef RootedGeneric<Lookup*> AutoLookupRooter;
typedef AutoLookupRooter &HandleLookup;
class AutoLookupVector;
class MOZ_STACK_CLASS HandleLookup {
friend class AutoLookupVector;
Lookup &lookup;
explicit HandleLookup(Lookup &lookup) : lookup(lookup) { }
public:
inline Lookup &get() { return lookup; }
inline Lookup *operator->() { return &lookup; }
};
private:
static bool finishSavedFrameInit(JSContext *cx, HandleObject ctor, HandleObject proto);
void initFromLookup(HandleLookup lookup);