diff options
| author | trav90 <travawine@protonmail.ch> | 2018-04-07 12:24:30 -0500 |
|---|---|---|
| committer | trav90 <travawine@protonmail.ch> | 2018-04-07 13:11:38 -0500 |
| commit | bbd4001cb261cc54e2adf804ea7cbeb09078d7d9 (patch) | |
| tree | 581523beea01c0b144051caebb6cb8a95539717a /xpcom | |
| parent | d960419686462067cb5745dcd1ad264abe0b1485 (diff) | |
| download | uxp-bbd4001cb261cc54e2adf804ea7cbeb09078d7d9.tar.gz | |
Fix Value::isGCThing footgun, stop returning true for NullValue
Diffstat (limited to 'xpcom')
| -rw-r--r-- | xpcom/base/nsCycleCollector.cpp | 2 | ||||
| -rw-r--r-- | xpcom/base/nsCycleCollectorTraceJSHelpers.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp index ca7057628c..d867f596e3 100644 --- a/xpcom/base/nsCycleCollector.cpp +++ b/xpcom/base/nsCycleCollector.cpp @@ -2690,7 +2690,7 @@ public: void* aClosure) const override { const JS::Value& val = aValue->unbarrieredGet(); - if (val.isMarkable() && ValueIsGrayCCThing(val)) { + if (val.isGCThing() && ValueIsGrayCCThing(val)) { MOZ_ASSERT(!js::gc::IsInsideNursery(val.toGCThing())); mCollector->GetJSPurpleBuffer()->mValues.InfallibleAppend(val); } diff --git a/xpcom/base/nsCycleCollectorTraceJSHelpers.cpp b/xpcom/base/nsCycleCollectorTraceJSHelpers.cpp index eb06a389c1..7c48002e30 100644 --- a/xpcom/base/nsCycleCollectorTraceJSHelpers.cpp +++ b/xpcom/base/nsCycleCollectorTraceJSHelpers.cpp @@ -36,7 +36,7 @@ void TraceCallbackFunc::Trace(JS::Heap<JS::Value>* aPtr, const char* aName, void* aClosure) const { - if (aPtr->unbarrieredGet().isMarkable()) { + if (aPtr->unbarrieredGet().isGCThing()) { mCallback(JS::GCCellPtr(aPtr->unbarrieredGet()), aName, aClosure); } } |