<!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>[248850] 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/248850">248850</a></dd>
<dt>Author</dt> <dd>ysuzuki@apple.com</dd>
<dt>Date</dt> <dd>2019-08-19 02:11:38 -0700 (Mon, 19 Aug 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[WTF] Add makeUnique<T>, which ensures T is fast-allocated, actual static_assert part
https://bugs.webkit.org/show_bug.cgi?id=200620

Reviewed by Geoff Garen.

Source/bmalloc:

Expose T::webkitFastMalloced type to perform static_assert in makeUnique.

* bmalloc/IsoHeap.h:
* bmalloc/IsoHeapInlines.h:

Source/WebCore:

* platform/network/curl/CookieJarCurl.h:

Source/WTF:

This is the last part of the split patch from https://bugs.webkit.org/show_bug.cgi?id=200620.
Expose T::webkitFastMalloced type to perform static_assert in makeUnique.
makeUnique and makeUniqueRef start performing static_assert check to ensure that the type T is FastMalloced / IsoHeaped.

* wtf/FastMalloc.h:
* wtf/StdLibExtras.h:
(WTF::makeUnique):
* wtf/UniqueRef.h:
(WTF::makeUniqueRef):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFastMalloch">trunk/Source/WTF/wtf/FastMalloc.h</a></li>
<li><a href="#trunkSourceWTFwtfStdLibExtrash">trunk/Source/WTF/wtf/StdLibExtras.h</a></li>
<li><a href="#trunkSourceWTFwtfUniqueRefh">trunk/Source/WTF/wtf/UniqueRef.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCookieJarCurlh">trunk/Source/WebCore/platform/network/curl/CookieJarCurl.h</a></li>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocIsoHeaph">trunk/Source/bmalloc/bmalloc/IsoHeap.h</a></li>
<li><a href="#trunkSourcebmallocbmallocIsoHeapInlinesh">trunk/Source/bmalloc/bmalloc/IsoHeapInlines.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (248849 => 248850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2019-08-19 08:25:24 UTC (rev 248849)
+++ trunk/Source/WTF/ChangeLog  2019-08-19 09:11:38 UTC (rev 248850)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2019-08-19  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [WTF] Add makeUnique<T>, which ensures T is fast-allocated, actual static_assert part
+        https://bugs.webkit.org/show_bug.cgi?id=200620
+
+        Reviewed by Geoff Garen.
+
+        This is the last part of the split patch from https://bugs.webkit.org/show_bug.cgi?id=200620.
+        Expose T::webkitFastMalloced type to perform static_assert in makeUnique.
+        makeUnique and makeUniqueRef start performing static_assert check to ensure that the type T is FastMalloced / IsoHeaped.
+
+        * wtf/FastMalloc.h:
+        * wtf/StdLibExtras.h:
+        (WTF::makeUnique):
+        * wtf/UniqueRef.h:
+        (WTF::makeUniqueRef):
+
</ins><span class="cx"> 2019-08-18  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [WTF] Add makeUnique<T>, which ensures T is fast-allocated, makeUnique / makeUniqueWithoutFastMallocCheck part
</span></span></pre></div>
<a id="trunkSourceWTFwtfFastMalloch"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FastMalloc.h (248849 => 248850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.h        2019-08-19 08:25:24 UTC (rev 248849)
+++ trunk/Source/WTF/wtf/FastMalloc.h   2019-08-19 09:11:38 UTC (rev 248850)
</span><span class="lines">@@ -297,13 +297,14 @@
</span><span class="cx">         ASSERT(location); \
</span><span class="cx">         return location; \
</span><span class="cx">     } \
</span><ins>+    using webkitFastMalloced = int; \
</ins><span class="cx"> 
</span><span class="cx"> #define WTF_MAKE_FAST_ALLOCATED \
</span><span class="cx"> public: \
</span><span class="cx">     WTF_MAKE_FAST_ALLOCATED_IMPL \
</span><span class="cx"> private: \
</span><del>-typedef int __thisIsHereToForceASemicolonAfterThisMacro
</del><ins>+using __thisIsHereToForceASemicolonAfterThisMacro = int
</ins><span class="cx"> 
</span><span class="cx"> #define WTF_MAKE_STRUCT_FAST_ALLOCATED \
</span><span class="cx">     WTF_MAKE_FAST_ALLOCATED_IMPL \
</span><del>-typedef int __thisIsHereToForceASemicolonAfterThisMacro
</del><ins>+using __thisIsHereToForceASemicolonAfterThisMacro = int
</ins></span></pre></div>
<a id="trunkSourceWTFwtfStdLibExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/StdLibExtras.h (248849 => 248850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/StdLibExtras.h      2019-08-19 08:25:24 UTC (rev 248849)
+++ trunk/Source/WTF/wtf/StdLibExtras.h 2019-08-19 09:11:38 UTC (rev 248850)
</span><span class="lines">@@ -570,6 +570,7 @@
</span><span class="cx"> template<class T, class... Args>
</span><span class="cx"> ALWAYS_INLINE decltype(auto) makeUnique(Args&&... args)
</span><span class="cx"> {
</span><ins>+    static_assert(std::is_same<typename T::webkitFastMalloced, int>::value, "T is FastMalloced");
</ins><span class="cx">     return std::make_unique<T>(std::forward<Args>(args)...);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWTFwtfUniqueRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/UniqueRef.h (248849 => 248850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/UniqueRef.h 2019-08-19 08:25:24 UTC (rev 248849)
+++ trunk/Source/WTF/wtf/UniqueRef.h    2019-08-19 09:11:38 UTC (rev 248850)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> template<typename T, class... Args>
</span><span class="cx"> UniqueRef<T> makeUniqueRef(Args&&... args)
</span><span class="cx"> {
</span><ins>+    static_assert(std::is_same<typename T::webkitFastMalloced, int>::value, "T is FastMalloced");
</ins><span class="cx">     return makeUniqueRefWithoutFastMallocCheck<T>(std::forward<Args>(args)...);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (248849 => 248850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-08-19 08:25:24 UTC (rev 248849)
+++ trunk/Source/WebCore/ChangeLog      2019-08-19 09:11:38 UTC (rev 248850)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2019-08-19  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [WTF] Add makeUnique<T>, which ensures T is fast-allocated, actual static_assert part
+        https://bugs.webkit.org/show_bug.cgi?id=200620
+
+        Reviewed by Geoff Garen.
+
+        * platform/network/curl/CookieJarCurl.h:
+
</ins><span class="cx"> 2019-08-19  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         enumerateDevices should return the same JS objects if called twice
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCookieJarCurlh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CookieJarCurl.h (248849 => 248850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CookieJarCurl.h       2019-08-19 08:25:24 UTC (rev 248849)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarCurl.h  2019-08-19 09:11:38 UTC (rev 248850)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> enum class CookieAcceptPolicy;
</span><span class="cx"> 
</span><span class="cx"> class CookieJarCurl {
</span><ins>+    WTF_MAKE_FAST_ALLOCATED;
</ins><span class="cx"> public:
</span><span class="cx">     std::pair<String, bool> cookiesForDOM(const NetworkStorageSession&, const URL& firstParty, const SameSiteInfo&, const URL&, Optional<FrameIdentifier> frameID, Optional<PageIdentifier>, IncludeSecureCookies) const;
</span><span class="cx">     void setCookiesFromDOM(const NetworkStorageSession&, const URL& firstParty, const SameSiteInfo&, const URL&, Optional<FrameIdentifier> frameID, Optional<PageIdentifier>, const String&) const;
</span></span></pre></div>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (248849 => 248850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog   2019-08-19 08:25:24 UTC (rev 248849)
+++ trunk/Source/bmalloc/ChangeLog      2019-08-19 09:11:38 UTC (rev 248850)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-08-19  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [WTF] Add makeUnique<T>, which ensures T is fast-allocated, actual static_assert part
+        https://bugs.webkit.org/show_bug.cgi?id=200620
+
+        Reviewed by Geoff Garen.
+
+        Expose T::webkitFastMalloced type to perform static_assert in makeUnique.
+
+        * bmalloc/IsoHeap.h:
+        * bmalloc/IsoHeapInlines.h:
+
</ins><span class="cx"> 2019-07-24  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [bmalloc] Add IsoHeap test to ensure that IsoHeap pages are not allocating too large VA
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocIsoHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/IsoHeap.h (248849 => 248850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/IsoHeap.h   2019-08-19 08:25:24 UTC (rev 248849)
+++ trunk/Source/bmalloc/bmalloc/IsoHeap.h      2019-08-19 09:11:38 UTC (rev 248850)
</span><span class="lines">@@ -82,7 +82,8 @@
</span><span class="cx">     \
</span><span class="cx">     void* operator new[](size_t size) = delete; \
</span><span class="cx">     void operator delete[](void* p) = delete; \
</span><ins>+using webkitFastMalloced = int; \
</ins><span class="cx"> private: \
</span><del>-typedef int __makeBisoMallocedMacroSemicolonifier
</del><ins>+using __makeBisoMallocedMacroSemicolonifier = int
</ins><span class="cx"> 
</span><span class="cx"> } } // namespace bmalloc::api
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocIsoHeapInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/IsoHeapInlines.h (248849 => 248850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/IsoHeapInlines.h    2019-08-19 08:25:24 UTC (rev 248849)
+++ trunk/Source/bmalloc/bmalloc/IsoHeapInlines.h       2019-08-19 09:11:38 UTC (rev 248850)
</span><span class="lines">@@ -123,8 +123,9 @@
</span><span class="cx">     \
</span><span class="cx">     void* operator new[](size_t size) = delete; \
</span><span class="cx">     void operator delete[](void* p) = delete; \
</span><ins>+using webkitFastMalloced = int; \
</ins><span class="cx"> private: \
</span><del>-typedef int __makeBisoMallocedInlineMacroSemicolonifier
</del><ins>+using __makeBisoMallocedInlineMacroSemicolonifier = int
</ins><span class="cx"> 
</span><span class="cx"> #define MAKE_BISO_MALLOCED_IMPL(isoType) \
</span><span class="cx"> ::bmalloc::api::IsoHeap<isoType>& isoType::bisoHeap() \
</span></span></pre>
</div>
</div>

</body>
</html>