diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-04-08 18:16:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-08 18:16:01 +0200 |
| commit | 6ac47e95318efb654682ed774fbbde1eb0fa2dd3 (patch) | |
| tree | 05e3594dc85fd66d29d122184157901fe7e51837 /js/src/gc/Marking.cpp | |
| parent | bf6bb142fc5bcb49b053788e06160af304f639e5 (diff) | |
| parent | bbd4001cb261cc54e2adf804ea7cbeb09078d7d9 (diff) | |
| download | UXP-6ac47e95318efb654682ed774fbbde1eb0fa2dd3.tar UXP-6ac47e95318efb654682ed774fbbde1eb0fa2dd3.tar.gz UXP-6ac47e95318efb654682ed774fbbde1eb0fa2dd3.tar.lz UXP-6ac47e95318efb654682ed774fbbde1eb0fa2dd3.tar.xz UXP-6ac47e95318efb654682ed774fbbde1eb0fa2dd3.zip | |
Merge pull request #94 from trav90/js-work
Fix Value::isGCThing footgun, stop returning true for NullValue
Diffstat (limited to 'js/src/gc/Marking.cpp')
| -rw-r--r-- | js/src/gc/Marking.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp index d9235f9ac..b2c105999 100644 --- a/js/src/gc/Marking.cpp +++ b/js/src/gc/Marking.cpp @@ -328,7 +328,7 @@ ShouldMarkCrossCompartment(JSTracer* trc, JSObject* src, Cell* cell) static bool ShouldMarkCrossCompartment(JSTracer* trc, JSObject* src, const Value& val) { - return val.isMarkable() && ShouldMarkCrossCompartment(trc, src, (Cell*)val.toGCThing()); + return val.isGCThing() && ShouldMarkCrossCompartment(trc, src, val.toGCThing()); } static void @@ -1599,7 +1599,7 @@ ObjectDenseElementsMayBeMarkable(NativeObject* nobj) if (!mayBeMarkable) { const Value* elements = nobj->getDenseElementsAllowCopyOnWrite(); for (unsigned i = 0; i < nobj->getDenseInitializedLength(); i++) - MOZ_ASSERT(!elements[i].isMarkable()); + MOZ_ASSERT(!elements[i].isGCThing()); } #endif |