Changeset 211514 in webkit

Timestamp:

Feb 1, 2017, 1:26:25 PM (9 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r211300. rdar://problem/30135571

Location:

branches/safari-603-branch/Source/JavaScriptCore

Files:

• API/JSVirtualMachine.mm (modified) (1 diff)
• ChangeLog (modified) (1 diff)

branches/safari-603-branch/Source/JavaScriptCore/API/JSVirtualMachine.mm

@@ -327 +327 @@
         [externalRememberedSet removeAllObjects];
     }
+
+    visitor.mergeIfNecessary();
 }
 

branches/safari-603-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-01-31  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r211300. rdar://problem/30135571
+
+    2017-01-27  Filip Pizlo  <fpizlo@apple.com>
+
+            scanExternalRememberedSet needs to mergeIfNecessary
+            https://bugs.webkit.org/show_bug.cgi?id=167523
+
+            Reviewed by Keith Miller.
+
+            The protocol for opaque roots is that if you add to them outside of draining, then you need to call
+            mergeIfNecessary.
+
+            This means that every MarkingConstraint that adds opaque roots needs to mergeIfNecessary after.
+
+            scanExternalRememberedSet transitively calls addOpaqueRoot, is called from a MarkingConstraint, and
+            was missing a call to mergeIfNecessary. This fixes it.
+
+            * API/JSVirtualMachine.mm:
+            (scanExternalRememberedSet):
+
 2017-01-27  Matthew Hanson  <matthew_hanson@apple.com>