From f94484fc9ae73d9a99c0abc30a469526604a2bfd Mon Sep 17 00:00:00 2001 From: Steve Fink Date: Thu, 20 Aug 2015 10:10:42 -0700 Subject: [PATCH] Bug 1196027 - check the actual current marking mode instead of the permanent intention, r=terrence --HG-- extra : rebase_source : 1a2da1602094596a9b3f6f16c3eb6f511cff29b7 extra : amend_source : c130055fc3110874fef7661019d751a1448cbde3 extra : source : 9ca39133a30af07bb6b27d5742b2c5865caa3b31 --- js/src/jsgc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp index a0f0fe6134aa..1b4769cd81e1 100644 --- a/js/src/jsgc.cpp +++ b/js/src/jsgc.cpp @@ -4034,7 +4034,7 @@ GCRuntime::markWeakReferences(gcstats::Phase phase) for (CompartmentIterT c(rt); !c.done(); c.next()) { if (c->watchpointMap) markedAny |= c->watchpointMap->markIteratively(&marker); - if (marker.weakMapAction() != ExpandWeakMaps) + if (!marker.isWeakMarkingTracer()) markedAny |= WeakMapBase::markCompartmentIteratively(c, &marker); } markedAny |= Debugger::markAllIteratively(&marker);