зеркало из https://github.com/mozilla/gecko-dev.git
Bug 538450 - Part 4: Remove JSRuntime::offThreadParsesRunning_. r=jonco
Differential Revision: https://phabricator.services.mozilla.com/D131366
This commit is contained in:
Родитель
40fe0d0d17
Коммит
9327076ba4
|
@ -120,12 +120,7 @@ void CheckArenaListAccess<Helper>::check() const {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
JSRuntime* rt = TlsContext.get()->runtime();
|
|
||||||
if (zone->isAtomsZone()) {
|
if (zone->isAtomsZone()) {
|
||||||
// We must hold the GC lock if parallel parsing is running.
|
|
||||||
if (rt->isOffThreadParseRunning()) {
|
|
||||||
rt->gc.assertCurrentThreadHasLockedGC();
|
|
||||||
}
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -156,7 +156,6 @@ JSRuntime::JSRuntime(JSRuntime* parentRuntime)
|
||||||
offthreadIonCompilationEnabled_(true),
|
offthreadIonCompilationEnabled_(true),
|
||||||
parallelParsingEnabled_(true),
|
parallelParsingEnabled_(true),
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
offThreadParsesRunning_(0),
|
|
||||||
offThreadParsingBlocked_(false),
|
offThreadParsingBlocked_(false),
|
||||||
#endif
|
#endif
|
||||||
autoWritableJitCodeActive_(false),
|
autoWritableJitCodeActive_(false),
|
||||||
|
@ -188,7 +187,6 @@ JSRuntime::~JSRuntime() {
|
||||||
|
|
||||||
MOZ_ASSERT(wasmInstances.lock()->empty());
|
MOZ_ASSERT(wasmInstances.lock()->empty());
|
||||||
|
|
||||||
MOZ_ASSERT(offThreadParsesRunning_ == 0);
|
|
||||||
MOZ_ASSERT(!offThreadParsingBlocked_);
|
MOZ_ASSERT(!offThreadParsingBlocked_);
|
||||||
|
|
||||||
MOZ_ASSERT(numRealms == 0);
|
MOZ_ASSERT(numRealms == 0);
|
||||||
|
|
|
@ -947,7 +947,6 @@ struct JSRuntime {
|
||||||
parallelParsingEnabled_;
|
parallelParsingEnabled_;
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
mozilla::Atomic<uint32_t> offThreadParsesRunning_;
|
|
||||||
mozilla::Atomic<bool> offThreadParsingBlocked_;
|
mozilla::Atomic<bool> offThreadParsingBlocked_;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -969,22 +968,9 @@ struct JSRuntime {
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
|
|
||||||
void incOffThreadParsesRunning() {
|
|
||||||
MOZ_ASSERT(!isOffThreadParsingBlocked());
|
|
||||||
offThreadParsesRunning_++;
|
|
||||||
}
|
|
||||||
|
|
||||||
void decOffThreadParsesRunning() {
|
|
||||||
MOZ_ASSERT(isOffThreadParseRunning());
|
|
||||||
offThreadParsesRunning_--;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool isOffThreadParseRunning() const { return offThreadParsesRunning_; }
|
|
||||||
|
|
||||||
bool isOffThreadParsingBlocked() const { return offThreadParsingBlocked_; }
|
bool isOffThreadParsingBlocked() const { return offThreadParsingBlocked_; }
|
||||||
void setOffThreadParsingBlocked(bool blocked) {
|
void setOffThreadParsingBlocked(bool blocked) {
|
||||||
MOZ_ASSERT(offThreadParsingBlocked_ != blocked);
|
MOZ_ASSERT(offThreadParsingBlocked_ != blocked);
|
||||||
MOZ_ASSERT(!isOffThreadParseRunning());
|
|
||||||
offThreadParsingBlocked_ = blocked;
|
offThreadParsingBlocked_ = blocked;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче