<!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>[201983] trunk/Source/bmalloc</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/201983">201983</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-06-12 06:22:53 -0700 (Sun, 12 Jun 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Crash in com.apple.WebKit.WebContent at std::__1::__call_once_proxy&lt;std::__1::tuple&lt;CrashReporterSupportLibrary()::$_0&amp;&amp;&gt; &gt;
&lt;https://webkit.org/b/158660&gt;
&lt;rdar://problem/25652686&gt;

Reviewed by Darin Adler.

* bmalloc/Logging.cpp: Switch to use
BSOFT_LINK_PRIVATE_FRAMEWORK() to link
CrashReporterSupport.framework.
* bmalloc/darwin/BSoftLinking.h:
(BSOFT_LINK_PRIVATE_FRAMEWORK): Rename from BSOFT_LINK_FRAMEWORK.
Switch to use /System/Library/PrivateFrameworks/.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocLoggingcpp">trunk/Source/bmalloc/bmalloc/Logging.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocdarwinBSoftLinkingh">trunk/Source/bmalloc/bmalloc/darwin/BSoftLinking.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (201982 => 201983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog        2016-06-12 01:14:58 UTC (rev 201982)
+++ trunk/Source/bmalloc/ChangeLog        2016-06-12 13:22:53 UTC (rev 201983)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-06-12  David Kilzer  &lt;ddkilzer@apple.com&gt;
+
+        Crash in com.apple.WebKit.WebContent at std::__1::__call_once_proxy&lt;std::__1::tuple&lt;CrashReporterSupportLibrary()::$_0&amp;&amp;&gt; &gt;
+        &lt;https://webkit.org/b/158660&gt;
+        &lt;rdar://problem/25652686&gt;
+
+        Reviewed by Darin Adler.
+
+        * bmalloc/Logging.cpp: Switch to use
+        BSOFT_LINK_PRIVATE_FRAMEWORK() to link
+        CrashReporterSupport.framework.
+        * bmalloc/darwin/BSoftLinking.h:
+        (BSOFT_LINK_PRIVATE_FRAMEWORK): Rename from BSOFT_LINK_FRAMEWORK.
+        Switch to use /System/Library/PrivateFrameworks/.
+
</ins><span class="cx"> 2016-06-11  David Kilzer  &lt;ddkilzer@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Implement logging for RELEASE_BASSERT_WITH_MESSAGE() in BAssert.h
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Logging.cpp (201982 => 201983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Logging.cpp        2016-06-12 01:14:58 UTC (rev 201982)
+++ trunk/Source/bmalloc/bmalloc/Logging.cpp        2016-06-12 13:22:53 UTC (rev 201983)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include &lt;unistd.h&gt;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;BSoftLinking.h&quot;
</span><del>-BSOFT_LINK_FRAMEWORK(CrashReporterSupport);
</del><ins>+BSOFT_LINK_PRIVATE_FRAMEWORK(CrashReporterSupport);
</ins><span class="cx"> BSOFT_LINK_FUNCTION(CrashReporterSupport, SimulateCrash, BOOL, (pid_t pid, mach_exception_data_type_t exceptionCode, id description), (pid, exceptionCode, description));
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocdarwinBSoftLinkingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/darwin/BSoftLinking.h (201982 => 201983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/darwin/BSoftLinking.h        2016-06-12 01:14:58 UTC (rev 201982)
+++ trunk/Source/bmalloc/bmalloc/darwin/BSoftLinking.h        2016-06-12 13:22:53 UTC (rev 201983)
</span><span class="lines">@@ -29,13 +29,13 @@
</span><span class="cx"> #include &lt;dlfcn.h&gt;
</span><span class="cx"> #include &lt;mutex&gt;
</span><span class="cx"> 
</span><del>-#define BSOFT_LINK_FRAMEWORK(framework) \
</del><ins>+#define BSOFT_LINK_PRIVATE_FRAMEWORK(framework) \
</ins><span class="cx">     static void* framework##Library() \
</span><span class="cx">     { \
</span><span class="cx">         static void* frameworkLibrary; \
</span><span class="cx">         static std::once_flag once; \
</span><span class="cx">         std::call_once(once, [] { \
</span><del>-            frameworkLibrary = dlopen(&quot;/System/Library/Frameworks/&quot; #framework &quot;.framework/&quot; #framework, RTLD_NOW); \
</del><ins>+            frameworkLibrary = dlopen(&quot;/System/Library/PrivateFrameworks/&quot; #framework &quot;.framework/&quot; #framework, RTLD_NOW); \
</ins><span class="cx">             RELEASE_BASSERT_WITH_MESSAGE(frameworkLibrary, &quot;%s&quot;, dlerror()); \
</span><span class="cx">         }); \
</span><span class="cx">         return frameworkLibrary; \
</span></span></pre>
</div>
</div>

</body>
</html>