<!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>[279179] trunk/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/279179">279179</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2021-06-23 12:20:02 -0700 (Wed, 23 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>add/removeManagedReference:withOwner: should have autoreleasepools
https://bugs.webkit.org/show_bug.cgi?id=227308

Reviewed by Darin Adler.

Since these APIs create autoreleased objects as an implementation detail
but don't return any to the caller there's no indication such autoreleased
objects could be accumulating. Additionally, it's entirely reasonable to
call these methods in a loop an a large set of objects, which further
exacerbates the problem.

* API/JSVirtualMachine.mm:
(-[JSVirtualMachine addManagedReference:withOwner:]):
(-[JSVirtualMachine removeManagedReference:withOwner:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSVirtualMachinemm">trunk/Source/JavaScriptCore/API/JSVirtualMachine.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSVirtualMachinemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSVirtualMachine.mm (279178 => 279179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSVirtualMachine.mm      2021-06-23 19:11:59 UTC (rev 279178)
+++ trunk/Source/JavaScriptCore/API/JSVirtualMachine.mm 2021-06-23 19:20:02 UTC (rev 279179)
</span><span class="lines">@@ -162,64 +162,68 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)addManagedReference:(id)object withOwner:(id)owner
</span><del>-{    
-    if ([object isKindOfClass:[JSManagedValue class]])
-        [object didAddOwner:owner];
-        
-    object = getInternalObjcObject(object);
-    owner = getInternalObjcObject(owner);
-    
-    if (!object || !owner)
-        return;
-    
-    JSC::JSLockHolder locker(toJS(m_group));
-    if ([self isOldExternalObject:owner] && ![self isOldExternalObject:object])
-        [self addExternalRememberedObject:owner];

-    Locker externalDataMutexLocker { m_externalDataMutex };
-    RetainPtr<NSMapTable> ownedObjects = [m_externalObjectGraph objectForKey:owner];
-    if (!ownedObjects) {
-        NSPointerFunctionsOptions weakIDOptions = NSPointerFunctionsWeakMemory | NSPointerFunctionsObjectPersonality;
-        NSPointerFunctionsOptions integerOptions = NSPointerFunctionsOpaqueMemory | NSPointerFunctionsIntegerPersonality;
-        ownedObjects = adoptNS([[NSMapTable alloc] initWithKeyOptions:weakIDOptions valueOptions:integerOptions capacity:1]);
</del><ins>+{
+    @autoreleasepool {
+        if ([object isKindOfClass:[JSManagedValue class]])
+            [object didAddOwner:owner];
</ins><span class="cx"> 
</span><del>-        [m_externalObjectGraph setObject:ownedObjects.get() forKey:owner];
</del><ins>+        object = getInternalObjcObject(object);
+        owner = getInternalObjcObject(owner);
+
+        if (!object || !owner)
+            return;
+
+        JSC::JSLockHolder locker(toJS(m_group));
+        if ([self isOldExternalObject:owner] && ![self isOldExternalObject:object])
+            [self addExternalRememberedObject:owner];
+
+        Locker externalDataMutexLocker { m_externalDataMutex };
+        RetainPtr<NSMapTable> ownedObjects = [m_externalObjectGraph objectForKey:owner];
+        if (!ownedObjects) {
+            NSPointerFunctionsOptions weakIDOptions = NSPointerFunctionsWeakMemory | NSPointerFunctionsObjectPersonality;
+            NSPointerFunctionsOptions integerOptions = NSPointerFunctionsOpaqueMemory | NSPointerFunctionsIntegerPersonality;
+            ownedObjects = adoptNS([[NSMapTable alloc] initWithKeyOptions:weakIDOptions valueOptions:integerOptions capacity:1]);
+
+            [m_externalObjectGraph setObject:ownedObjects.get() forKey:owner];
+        }
+
+        size_t count = reinterpret_cast<size_t>(NSMapGet(ownedObjects.get(), (__bridge void*)object));
+        NSMapInsert(ownedObjects.get(), (__bridge void*)object, reinterpret_cast<void*>(count + 1));
</ins><span class="cx">     }
</span><del>-
-    size_t count = reinterpret_cast<size_t>(NSMapGet(ownedObjects.get(), (__bridge void*)object));
-    NSMapInsert(ownedObjects.get(), (__bridge void*)object, reinterpret_cast<void*>(count + 1));
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)removeManagedReference:(id)object withOwner:(id)owner
</span><span class="cx"> {
</span><del>-    if ([object isKindOfClass:[JSManagedValue class]])
-        [object didRemoveOwner:owner];
</del><ins>+    @autoreleasepool {
+        if ([object isKindOfClass:[JSManagedValue class]])
+            [object didRemoveOwner:owner];
</ins><span class="cx"> 
</span><del>-    object = getInternalObjcObject(object);
-    owner = getInternalObjcObject(owner);
-    
-    if (!object || !owner)
-        return;
-    
-    JSC::JSLockHolder locker(toJS(m_group));
-    
-    Locker externalDataMutexLocker { m_externalDataMutex };
-    NSMapTable *ownedObjects = [m_externalObjectGraph objectForKey:owner];
-    if (!ownedObjects)
-        return;
-   
-    size_t count = reinterpret_cast<size_t>(NSMapGet(ownedObjects, (__bridge void*)object));
-    if (count > 1) {
-        NSMapInsert(ownedObjects, (__bridge void*)object, reinterpret_cast<void*>(count - 1));
-        return;
-    }
-    
-    if (count == 1)
-        NSMapRemove(ownedObjects, (__bridge void*)object);
</del><ins>+        object = getInternalObjcObject(object);
+        owner = getInternalObjcObject(owner);
</ins><span class="cx"> 
</span><del>-    if (![ownedObjects count]) {
-        [m_externalObjectGraph removeObjectForKey:owner];
-        [m_externalRememberedSet removeObjectForKey:owner];
</del><ins>+        if (!object || !owner)
+            return;
+
+        JSC::JSLockHolder locker(toJS(m_group));
+
+        Locker externalDataMutexLocker { m_externalDataMutex };
+        NSMapTable *ownedObjects = [m_externalObjectGraph objectForKey:owner];
+        if (!ownedObjects)
+            return;
+
+        size_t count = reinterpret_cast<size_t>(NSMapGet(ownedObjects, (__bridge void*)object));
+        if (count > 1) {
+            NSMapInsert(ownedObjects, (__bridge void*)object, reinterpret_cast<void*>(count - 1));
+            return;
+        }
+
+        if (count == 1)
+            NSMapRemove(ownedObjects, (__bridge void*)object);
+
+        if (![ownedObjects count]) {
+            [m_externalObjectGraph removeObjectForKey:owner];
+            [m_externalRememberedSet removeObjectForKey:owner];
+        }
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (279178 => 279179)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-06-23 19:11:59 UTC (rev 279178)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-06-23 19:20:02 UTC (rev 279179)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-06-23  Keith Miller  <keith_miller@apple.com>
+
+        add/removeManagedReference:withOwner: should have autoreleasepools
+        https://bugs.webkit.org/show_bug.cgi?id=227308
+
+        Reviewed by Darin Adler.
+
+        Since these APIs create autoreleased objects as an implementation detail
+        but don't return any to the caller there's no indication such autoreleased
+        objects could be accumulating. Additionally, it's entirely reasonable to
+        call these methods in a loop an a large set of objects, which further
+        exacerbates the problem.
+
+        * API/JSVirtualMachine.mm:
+        (-[JSVirtualMachine addManagedReference:withOwner:]):
+        (-[JSVirtualMachine removeManagedReference:withOwner:]):
+
</ins><span class="cx"> 2021-06-23  Saam Barati  <sbarati@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Run lazy properties initializers under a DeferTerminationForAWhile scope
</span></span></pre>
</div>
</div>

</body>
</html>