diff options
| author | Moonchild <git-repo@palemoon.org> | 2020-02-26 02:38:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-26 02:38:18 +0100 |
| commit | cce2bc96771613f51659e9209181e0d54a3fee96 (patch) | |
| tree | cbeec2384bd44bab37cd787215ec830fa8b356cd /js/src/jsgc.cpp | |
| parent | 35c26c6c19e66fabcb230fb074e76e243df04d2b (diff) | |
| parent | ecdeefc4dd5624e824e696ac1c492c0b103f4acd (diff) | |
| download | UXP-cce2bc96771613f51659e9209181e0d54a3fee96.tar UXP-cce2bc96771613f51659e9209181e0d54a3fee96.tar.gz UXP-cce2bc96771613f51659e9209181e0d54a3fee96.tar.lz UXP-cce2bc96771613f51659e9209181e0d54a3fee96.tar.xz UXP-cce2bc96771613f51659e9209181e0d54a3fee96.zip | |
Merge pull request #1461 from MoonchildProductions/ubbo
Back out unboxed array/object removals
Diffstat (limited to 'js/src/jsgc.cpp')
| -rw-r--r-- | js/src/jsgc.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp index 3ad526f74..64573b55a 100644 --- a/js/src/jsgc.cpp +++ b/js/src/jsgc.cpp @@ -6176,6 +6176,12 @@ gc::MergeCompartments(JSCompartment* source, JSCompartment* target) for (auto group = source->zone()->cellIter<ObjectGroup>(); !group.done(); group.next()) { group->setGeneration(target->zone()->types.generation); group->compartment_ = target; + + // Remove any unboxed layouts from the list in the off thread + // compartment. These do not need to be reinserted in the target + // compartment's list, as the list is not required to be complete. + if (UnboxedLayout* layout = group->maybeUnboxedLayoutDontCheckGeneration()) + layout->detachFromCompartment(); } // Fixup zone pointers in source's zone to refer to target's zone. |