Title: [211924] branches/safari-604.1.5-branch/Source/_javascript_Core
- Revision
- 211924
- Author
- matthew_han...@apple.com
- Date
- 2017-02-08 18:06:10 -0800 (Wed, 08 Feb 2017)
Log Message
Merge r211300. rdar://problem/30425272
Modified Paths
Diff
Modified: branches/safari-604.1.5-branch/Source/_javascript_Core/API/JSVirtualMachine.mm (211923 => 211924)
--- branches/safari-604.1.5-branch/Source/_javascript_Core/API/JSVirtualMachine.mm 2017-02-09 02:06:07 UTC (rev 211923)
+++ branches/safari-604.1.5-branch/Source/_javascript_Core/API/JSVirtualMachine.mm 2017-02-09 02:06:10 UTC (rev 211924)
@@ -326,6 +326,8 @@
}
[externalRememberedSet removeAllObjects];
}
+
+ visitor.mergeIfNecessary();
}
#endif // JSC_OBJC_API_ENABLED
Modified: branches/safari-604.1.5-branch/Source/_javascript_Core/ChangeLog (211923 => 211924)
--- branches/safari-604.1.5-branch/Source/_javascript_Core/ChangeLog 2017-02-09 02:06:07 UTC (rev 211923)
+++ branches/safari-604.1.5-branch/Source/_javascript_Core/ChangeLog 2017-02-09 02:06:10 UTC (rev 211924)
@@ -1,3 +1,25 @@
+2017-02-08 Matthew Hanson <matt_han...@apple.com>
+
+ Merge r211300. rdar://problem/30425272
+
+ 2017-01-27 Filip Pizlo <fpi...@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-02-07 Matthew Hanson <matt_han...@apple.com>
Merge r211630. rdar://problem/30357032
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
