summaryrefslogtreecommitdiffstats
path: root/js/src/vm/Compartment.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'js/src/vm/Compartment.cpp')
-rw-r--r--js/src/vm/Compartment.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/js/src/vm/Compartment.cpp b/js/src/vm/Compartment.cpp
index 4efb92366b..749342b167 100644
--- a/js/src/vm/Compartment.cpp
+++ b/js/src/vm/Compartment.cpp
@@ -52,14 +52,10 @@ Compartment::Compartment(Zone* zone, bool invisibleToDebugger)
void Compartment::checkObjectWrappersAfterMovingGC() {
for (ObjectWrapperEnum e(this); !e.empty(); e.popFront()) {
- // Assert that the postbarriers have worked and that nothing is left in the
- // wrapper map that points into the nursery, and that the hash table entries
- // are discoverable.
auto key = e.front().key();
- CheckGCThingAfterMovingGC(key.get());
-
- auto ptr = crossCompartmentObjectWrappers.lookup(key);
- MOZ_RELEASE_ASSERT(ptr.found() && &*ptr == &e.front());
+ CheckGCThingAfterMovingGC(key.get()); // Keys may be in a different zone.
+ CheckGCThingAfterMovingGC(e.front().value().unbarrieredGet(), zone());
+ CheckTableEntryAfterMovingGC(crossCompartmentObjectWrappers, e, key);
}
}