<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[210528] tags/Safari-603.1.19.1/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/210528">210528</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2017-01-09 15:58:35 -0800 (Mon, 09 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210458">r210458</a>. rdar://problem/29911919</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6031191SourceJavaScriptCoreAPIJSVirtualMachinemm">tags/Safari-603.1.19.1/Source/JavaScriptCore/API/JSVirtualMachine.mm</a></li>
<li><a href="#tagsSafari6031191SourceJavaScriptCoreAPIJSVirtualMachineInternalh">tags/Safari-603.1.19.1/Source/JavaScriptCore/API/JSVirtualMachineInternal.h</a></li>
<li><a href="#tagsSafari6031191SourceJavaScriptCoreChangeLog">tags/Safari-603.1.19.1/Source/JavaScriptCore/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6031191SourceJavaScriptCoreAPIJSVirtualMachinemm"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.19.1/Source/JavaScriptCore/API/JSVirtualMachine.mm (210527 => 210528)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.19.1/Source/JavaScriptCore/API/JSVirtualMachine.mm 2017-01-09 23:24:37 UTC (rev 210527)
+++ tags/Safari-603.1.19.1/Source/JavaScriptCore/API/JSVirtualMachine.mm 2017-01-09 23:58:35 UTC (rev 210528)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation JSVirtualMachine {
</span><span class="cx"> JSContextGroupRef m_group;
</span><ins>+ Lock m_externalDataMutex;
</ins><span class="cx"> NSMapTable *m_contextCache;
</span><span class="cx"> NSMapTable *m_externalObjectGraph;
</span><span class="cx"> NSMapTable *m_externalRememberedSet;
</span><span class="lines">@@ -156,6 +157,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)addExternalRememberedObject:(id)object
</span><span class="cx"> {
</span><ins>+ auto locker = holdLock(m_externalDataMutex);
</ins><span class="cx"> ASSERT([self isOldExternalObject:object]);
</span><span class="cx"> [m_externalRememberedSet setObject:@YES forKey:object];
</span><span class="cx"> }
</span><span class="lines">@@ -175,6 +177,7 @@
</span><span class="cx"> if ([self isOldExternalObject:owner] && ![self isOldExternalObject:object])
</span><span class="cx"> [self addExternalRememberedObject:owner];
</span><span class="cx">
</span><ins>+ auto externalDataMutexLocker = holdLock(m_externalDataMutex);
</ins><span class="cx"> NSMapTable *ownedObjects = [m_externalObjectGraph objectForKey:owner];
</span><span class="cx"> if (!ownedObjects) {
</span><span class="cx"> NSPointerFunctionsOptions weakIDOptions = NSPointerFunctionsWeakMemory | NSPointerFunctionsObjectPersonality;
</span><span class="lines">@@ -202,6 +205,7 @@
</span><span class="cx">
</span><span class="cx"> JSC::JSLockHolder locker(toJS(m_group));
</span><span class="cx">
</span><ins>+ auto externalDataMutexLocker = holdLock(m_externalDataMutex);
</ins><span class="cx"> NSMapTable *ownedObjects = [m_externalObjectGraph objectForKey:owner];
</span><span class="cx"> if (!ownedObjects)
</span><span class="cx"> return;
</span><span class="lines">@@ -248,6 +252,11 @@
</span><span class="cx"> NSMapInsert(m_contextCache, globalContext, wrapper);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (Lock&)externalDataMutex
+{
+ return m_externalDataMutex;
+}
+
</ins><span class="cx"> - (NSMapTable *)externalObjectGraph
</span><span class="cx"> {
</span><span class="cx"> return m_externalObjectGraph;
</span><span class="lines">@@ -260,7 +269,7 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-void scanExternalObjectGraph(JSC::VM& vm, JSC::SlotVisitor& visitor, void* root)
</del><ins>+static void scanExternalObjectGraph(JSC::VM& vm, JSC::SlotVisitor& visitor, void* root, bool lockAcquired)
</ins><span class="cx"> {
</span><span class="cx"> @autoreleasepool {
</span><span class="cx"> JSVirtualMachine *virtualMachine = [JSVMWrapperCache wrapperForJSContextGroupRef:toRef(&vm)];
</span><span class="lines">@@ -267,6 +276,7 @@
</span><span class="cx"> if (!virtualMachine)
</span><span class="cx"> return;
</span><span class="cx"> NSMapTable *externalObjectGraph = [virtualMachine externalObjectGraph];
</span><ins>+ Lock& externalDataMutex = [virtualMachine externalDataMutex];
</ins><span class="cx"> Vector<void*> stack;
</span><span class="cx"> stack.append(root);
</span><span class="cx"> while (!stack.isEmpty()) {
</span><span class="lines">@@ -275,14 +285,29 @@
</span><span class="cx"> if (visitor.containsOpaqueRootTriState(nextRoot) == TrueTriState)
</span><span class="cx"> continue;
</span><span class="cx"> visitor.addOpaqueRoot(nextRoot);
</span><del>-
- NSMapTable *ownedObjects = [externalObjectGraph objectForKey:static_cast<id>(nextRoot)];
- for (id ownedObject in ownedObjects)
- stack.append(static_cast<void*>(ownedObject));
</del><ins>+
+ auto appendOwnedObjects = [&] {
+ NSMapTable *ownedObjects = [externalObjectGraph objectForKey:static_cast<id>(nextRoot)];
+ for (id ownedObject in ownedObjects)
+ stack.append(static_cast<void*>(ownedObject));
+ };
+
+ if (lockAcquired)
+ appendOwnedObjects();
+ else {
+ auto locker = holdLock(externalDataMutex);
+ appendOwnedObjects();
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void scanExternalObjectGraph(JSC::VM& vm, JSC::SlotVisitor& visitor, void* root)
+{
+ bool lockAcquired = false;
+ scanExternalObjectGraph(vm, visitor, root, lockAcquired);
+}
+
</ins><span class="cx"> void scanExternalRememberedSet(JSC::VM& vm, JSC::SlotVisitor& visitor)
</span><span class="cx"> {
</span><span class="cx"> @autoreleasepool {
</span><span class="lines">@@ -289,12 +314,15 @@
</span><span class="cx"> JSVirtualMachine *virtualMachine = [JSVMWrapperCache wrapperForJSContextGroupRef:toRef(&vm)];
</span><span class="cx"> if (!virtualMachine)
</span><span class="cx"> return;
</span><ins>+ Lock& externalDataMutex = [virtualMachine externalDataMutex];
+ auto locker = holdLock(externalDataMutex);
</ins><span class="cx"> NSMapTable *externalObjectGraph = [virtualMachine externalObjectGraph];
</span><span class="cx"> NSMapTable *externalRememberedSet = [virtualMachine externalRememberedSet];
</span><span class="cx"> for (id key in externalRememberedSet) {
</span><span class="cx"> NSMapTable *ownedObjects = [externalObjectGraph objectForKey:key];
</span><ins>+ bool lockAcquired = true;
</ins><span class="cx"> for (id ownedObject in ownedObjects)
</span><del>- scanExternalObjectGraph(vm, visitor, ownedObject);
</del><ins>+ scanExternalObjectGraph(vm, visitor, ownedObject, lockAcquired);
</ins><span class="cx"> }
</span><span class="cx"> [externalRememberedSet removeAllObjects];
</span><span class="cx"> }
</span></span></pre></div>
<a id="tagsSafari6031191SourceJavaScriptCoreAPIJSVirtualMachineInternalh"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.19.1/Source/JavaScriptCore/API/JSVirtualMachineInternal.h (210527 => 210528)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.19.1/Source/JavaScriptCore/API/JSVirtualMachineInternal.h 2017-01-09 23:24:37 UTC (rev 210527)
+++ tags/Safari-603.1.19.1/Source/JavaScriptCore/API/JSVirtualMachineInternal.h 2017-01-09 23:58:35 UTC (rev 210528)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -47,8 +47,6 @@
</span><span class="cx"> - (JSContext *)contextForGlobalContextRef:(JSGlobalContextRef)globalContext;
</span><span class="cx"> - (void)addContext:(JSContext *)wrapper forGlobalContextRef:(JSGlobalContextRef)globalContext;
</span><span class="cx">
</span><del>-- (NSMapTable *)externalObjectGraph;
-
</del><span class="cx"> @end
</span><span class="cx"> #endif // defined(__OBJC__)
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari6031191SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-603.1.19.1/Source/JavaScriptCore/ChangeLog (210527 => 210528)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-603.1.19.1/Source/JavaScriptCore/ChangeLog 2017-01-09 23:24:37 UTC (rev 210527)
+++ tags/Safari-603.1.19.1/Source/JavaScriptCore/ChangeLog 2017-01-09 23:58:35 UTC (rev 210528)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2017-01-09 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r210458. rdar://problem/29911919
+
+ 2017-01-06 Mark Lam <mark.lam@apple.com>
+
+ The ObjC API's JSVirtualMachine's map tables need to be guarded by a lock.
+ https://bugs.webkit.org/show_bug.cgi?id=166778
+ <rdar://problem/29761198>
+
+ Reviewed by Filip Pizlo.
+
+ Now that we have a concurrent GC, access to JSVirtualMachine's
+ m_externalObjectGraph and m_externalRememberedSet need to be guarded by a lock
+ since both the GC marker thread and the mutator thread may access them at the
+ same time.
+
+ * API/JSVirtualMachine.mm:
+ (-[JSVirtualMachine addExternalRememberedObject:]):
+ (-[JSVirtualMachine addManagedReference:withOwner:]):
+ (-[JSVirtualMachine removeManagedReference:withOwner:]):
+ (-[JSVirtualMachine externalDataMutex]):
+ (scanExternalObjectGraph):
+ (scanExternalRememberedSet):
+
+ * API/JSVirtualMachineInternal.h:
+ - Deleted externalObjectGraph method. There's no need to expose this.
+
</ins><span class="cx"> 2017-01-06 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert the following merges as part of disabling Web Assembly. rdar://problem/29890343
</span></span></pre>
</div>
</div>
</body>
</html>