<!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>[277914] trunk/Source</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/277914">277914</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-05-21 23:39:44 -0700 (Fri, 21 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove WTF::holdLock() / WTF::holdLockIf()
https://bugs.webkit.org/show_bug.cgi?id=226135

Reviewed by Darin Adler.

Remove WTF::holdLock() / WTF::holdLockIf() because they are not compatible with
Clang Thread Safety Analysis. All call sites have been converted to use the Locker
constructor directly.

Source/JavaScriptCore:

* heap/LockDuringMarking.h:
(JSC::lockDuringMarking):

Source/WebCore:

* dom/Node.cpp:
(WebCore::Node::eventTargetDataConcurrently):

Source/WTF:

* wtf/Locker.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapLockDuringMarkingh">trunk/Source/JavaScriptCore/heap/LockDuringMarking.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfLockerh">trunk/Source/WTF/wtf/Locker.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (277913 => 277914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-05-22 05:49:16 UTC (rev 277913)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-05-22 06:39:44 UTC (rev 277914)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2021-05-21  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><ins>+        Remove WTF::holdLock() / WTF::holdLockIf()
+        https://bugs.webkit.org/show_bug.cgi?id=226135
+
+        Reviewed by Darin Adler.
+
+        Remove WTF::holdLock() / WTF::holdLockIf() because they are not compatible with
+        Clang Thread Safety Analysis. All call sites have been converted to use the Locker
+        constructor directly.
+
+        * heap/LockDuringMarking.h:
+        (JSC::lockDuringMarking):
+
+2021-05-21  Chris Dumez  <cdumez@apple.com>
+
</ins><span class="cx">         Replace LockHolder with Locker in local variables
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=226133
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapLockDuringMarkingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/LockDuringMarking.h (277913 => 277914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/LockDuringMarking.h     2021-05-22 05:49:16 UTC (rev 277913)
+++ trunk/Source/JavaScriptCore/heap/LockDuringMarking.h        2021-05-22 06:39:44 UTC (rev 277914)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> template<typename LockType>
</span><span class="cx"> auto lockDuringMarking(Heap& heap, LockType& passedLock)
</span><span class="cx"> {
</span><del>-    return holdLockIf(passedLock, heap.mutatorShouldBeFenced());
</del><ins>+    return Locker { heap.mutatorShouldBeFenced() ? &passedLock : nullptr };
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (277913 => 277914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2021-05-22 05:49:16 UTC (rev 277913)
+++ trunk/Source/WTF/ChangeLog  2021-05-22 06:39:44 UTC (rev 277914)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2021-05-21  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><ins>+        Remove WTF::holdLock() / WTF::holdLockIf()
+        https://bugs.webkit.org/show_bug.cgi?id=226135
+
+        Reviewed by Darin Adler.
+
+        Remove WTF::holdLock() / WTF::holdLockIf() because they are not compatible with
+        Clang Thread Safety Analysis. All call sites have been converted to use the Locker
+        constructor directly.
+
+        * wtf/Locker.h:
+
+2021-05-21  Chris Dumez  <cdumez@apple.com>
+
</ins><span class="cx">         Replace LockHolder with Locker in local variables
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=226133
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWTFwtfLockerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Locker.h (277913 => 277914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Locker.h    2021-05-22 05:49:16 UTC (rev 277913)
+++ trunk/Source/WTF/wtf/Locker.h       2021-05-22 06:39:44 UTC (rev 277914)
</span><span class="lines">@@ -136,25 +136,7 @@
</span><span class="cx">     T* m_lockable;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-// Use this lock scope like so:
-// auto locker = holdLock(lock);
</del><span class="cx"> template<typename LockType>
</span><del>-Locker<LockType> holdLock(LockType&) WARN_UNUSED_RETURN;
-template<typename LockType>
-Locker<LockType> holdLock(LockType& lock)
-{
-    return Locker<LockType>(lock);
-}
-
-template<typename LockType>
-Locker<LockType> holdLockIf(LockType&, bool predicate) WARN_UNUSED_RETURN;
-template<typename LockType>
-Locker<LockType> holdLockIf(LockType& lock, bool predicate)
-{
-    return Locker<LockType>(predicate ? &lock : nullptr);
-}
-
-template<typename LockType>
</del><span class="cx"> Locker<LockType> tryHoldLock(LockType&) WARN_UNUSED_RETURN;
</span><span class="cx"> template<typename LockType>
</span><span class="cx"> Locker<LockType> tryHoldLock(LockType& lock)
</span><span class="lines">@@ -187,6 +169,4 @@
</span><span class="cx"> using WTF::Locker;
</span><span class="cx"> using WTF::NoLockingNecessaryTag;
</span><span class="cx"> using WTF::NoLockingNecessary;
</span><del>-using WTF::holdLock;
-using WTF::holdLockIf;
</del><span class="cx"> using WTF::DropLockForScope;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (277913 => 277914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-05-22 05:49:16 UTC (rev 277913)
+++ trunk/Source/WebCore/ChangeLog      2021-05-22 06:39:44 UTC (rev 277914)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2021-05-21  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><ins>+        Remove WTF::holdLock() / WTF::holdLockIf()
+        https://bugs.webkit.org/show_bug.cgi?id=226135
+
+        Reviewed by Darin Adler.
+
+        Remove WTF::holdLock() / WTF::holdLockIf() because they are not compatible with
+        Clang Thread Safety Analysis. All call sites have been converted to use the Locker
+        constructor directly.
+
+        * dom/Node.cpp:
+        (WebCore::Node::eventTargetDataConcurrently):
+
+2021-05-21  Chris Dumez  <cdumez@apple.com>
+
</ins><span class="cx">         Replace LockHolder with Locker in local variables
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=226133
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (277913 => 277914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp        2021-05-22 05:49:16 UTC (rev 277913)
+++ trunk/Source/WebCore/dom/Node.cpp   2021-05-22 06:39:44 UTC (rev 277914)
</span><span class="lines">@@ -2227,7 +2227,7 @@
</span><span class="cx">     // world is stopped. We don't have to hold the lock when the world is stopped, because a stopped world
</span><span class="cx">     // means that we will never mutate the event target data map.
</span><span class="cx">     JSC::VM* vm = commonVMOrNull();
</span><del>-    auto locker = holdLockIf(s_eventTargetDataMapLock, vm && vm->heap.worldIsRunning());
</del><ins>+    Locker locker { vm && vm->heap.worldIsRunning() ? &s_eventTargetDataMapLock : nullptr };
</ins><span class="cx">     return hasEventTargetData() ? eventTargetDataMap().get(this) : nullptr;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>