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 1188620 - Use PersistentRooted for asyncActivation roots; r=fitzgen

Browse Source
This commit is contained in:
Terrence Cole 2015-07-29 10:23:14 -07:00
parent 192b87a7e1
commit 266bd44fa0
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/gc/RootMarking.cpp
View File

@ -365,12 +365,6 @@ js::gc::GCRuntime::markRuntime(JSTracer* trc,
MarkPersistentRootedChains(trc); MarkPersistentRootedChains(trc);
} }
if (rt->asyncStackForNewActivations)
TraceRoot(trc, &rt->asyncStackForNewActivations, "asyncStackForNewActivations");
if (rt->asyncCauseForNewActivations)
TraceRoot(trc, &rt->asyncCauseForNewActivations, "asyncCauseForNewActivations");
if (rt->scriptAndCountsVector) { if (rt->scriptAndCountsVector) {
ScriptAndCountsVector& vec = *rt->scriptAndCountsVector; ScriptAndCountsVector& vec = *rt->scriptAndCountsVector;
for (size_t i = 0; i < vec.length(); i++) for (size_t i = 0; i < vec.length(); i++)

4
js/src/vm/Runtime.cpp
View File

@ -126,8 +126,8 @@ JSRuntime::JSRuntime(JSRuntime* parentRuntime)
profilerSampleBufferGen_(0), profilerSampleBufferGen_(0),
profilerSampleBufferLapCount_(1), profilerSampleBufferLapCount_(1),
asmJSActivationStack_(nullptr), asmJSActivationStack_(nullptr),
asyncStackForNewActivations(nullptr), asyncStackForNewActivations(this),
asyncCauseForNewActivations(nullptr), asyncCauseForNewActivations(this),
asyncCallIsExplicit(false), asyncCallIsExplicit(false),
entryMonitor(nullptr), entryMonitor(nullptr),
parentRuntime(parentRuntime), parentRuntime(parentRuntime),

4
js/src/vm/Runtime.h
View File

@ -690,12 +690,12 @@ struct JSRuntime : public JS::shadow::Runtime,
* New activations will reset this to nullptr on construction after getting * New activations will reset this to nullptr on construction after getting
* the current value, and will restore the previous value on destruction. * the current value, and will restore the previous value on destruction.
*/ */
js::SavedFrame* asyncStackForNewActivations; JS::PersistentRooted<js::SavedFrame*> asyncStackForNewActivations;
/* /*
* Value of asyncCause to be attached to asyncStackForNewActivations. * Value of asyncCause to be attached to asyncStackForNewActivations.
*/ */
JSString* asyncCauseForNewActivations; JS::PersistentRooted<JSString*> asyncCauseForNewActivations;
/* /*
* True if the async call was explicitly requested, e.g. via * True if the async call was explicitly requested, e.g. via