<!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>[178144] 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/178144">178144</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-01-08 16:41:58 -0800 (Thu, 08 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make bmalloc work with ASan
https://bugs.webkit.org/show_bug.cgi?id=140194
Reviewed by Mark Lam.
* bmalloc/BPlatform.h: Added a way to detect Darwin OSes, since we need
an OS-specific API to test for loaded runtime libraries.
* bmalloc/Environment.cpp:
(bmalloc::isASanEnabled):
(bmalloc::Environment::computeIsBmallocEnabled): Disabled bmalloc if
ASan is enabled, since system malloc has the Asan hooks we need.
You could check for the ASan compile-time flag instead, but doing this
check at runtime prepares bmalloc for a world where it is a dynamic
library that might be loaded into projects it did not compile with.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocBPlatformh">trunk/Source/bmalloc/bmalloc/BPlatform.h</a></li>
<li><a href="#trunkSourcebmallocbmallocEnvironmentcpp">trunk/Source/bmalloc/bmalloc/Environment.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (178143 => 178144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2015-01-09 00:10:01 UTC (rev 178143)
+++ trunk/Source/bmalloc/ChangeLog 2015-01-09 00:41:58 UTC (rev 178144)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-07 Geoffrey Garen <ggaren@apple.com>
+
+ Make bmalloc work with ASan
+ https://bugs.webkit.org/show_bug.cgi?id=140194
+
+ Reviewed by Mark Lam.
+
+ * bmalloc/BPlatform.h: Added a way to detect Darwin OSes, since we need
+ an OS-specific API to test for loaded runtime libraries.
+
+ * bmalloc/Environment.cpp:
+ (bmalloc::isASanEnabled):
+ (bmalloc::Environment::computeIsBmallocEnabled): Disabled bmalloc if
+ ASan is enabled, since system malloc has the Asan hooks we need.
+
+ You could check for the ASan compile-time flag instead, but doing this
+ check at runtime prepares bmalloc for a world where it is a dynamic
+ library that might be loaded into projects it did not compile with.
+
</ins><span class="cx"> 2015-01-05 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix up bmalloc's PerThread for use on Linux
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocBPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/BPlatform.h (178143 => 178144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/BPlatform.h 2015-01-09 00:10:01 UTC (rev 178143)
+++ trunk/Source/bmalloc/bmalloc/BPlatform.h 2015-01-09 00:41:58 UTC (rev 178144)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #define BPLATFORM(PLATFORM) (defined BPLATFORM_##PLATFORM && BPLATFORM_##PLATFORM)
</span><ins>+#define BOS(OS) (defined BOS_##OS && BOS_##OS)
</ins><span class="cx">
</span><span class="cx"> #if ((defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) \
</span><span class="cx"> || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) \
</span><span class="lines">@@ -38,7 +39,8 @@
</span><span class="cx"> #define BPLATFORM_IOS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#define BCOMPILER_SUPPORTS(COMPILER_FEATURE) (defined BCOMPILER_SUPPORTS_##COMPILER_FEATURE && BCOMPILER_SUPPORTS_##COMPILER_FEATURE)
-#define BCOMPILER_SUPPORTS_CXX_THREAD_LOCAL (defined(__has_feature) && __has_feature(cxx_thread_local))
</del><ins>+#ifdef __APPLE__
+#define BOS_DARWIN 1
+#endif
</ins><span class="cx">
</span><span class="cx"> #endif // BPlatform_h
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocEnvironmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Environment.cpp (178143 => 178144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Environment.cpp 2015-01-09 00:10:01 UTC (rev 178143)
+++ trunk/Source/bmalloc/bmalloc/Environment.cpp 2015-01-09 00:41:58 UTC (rev 178144)
</span><span class="lines">@@ -23,9 +23,13 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#include "BPlatform.h"
</ins><span class="cx"> #include "Environment.h"
</span><span class="cx"> #include <cstdlib>
</span><span class="cx"> #include <cstring>
</span><ins>+#if BOS(DARWIN)
+#include <mach-o/dyld.h>
+#endif
</ins><span class="cx">
</span><span class="cx"> namespace bmalloc {
</span><span class="cx">
</span><span class="lines">@@ -69,6 +73,20 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool isASanEnabled()
+{
+#if BOS(DARWIN)
+ uint32_t imageCount = _dyld_image_count();
+ for (uint32_t i = 0; i < imageCount; ++i) {
+ if (strstr(_dyld_get_image_name(i), "/libclang_rt.asan_"))
+ return true;
+ }
+ return false;
+#else
+ return false;
+#endif
+}
+
</ins><span class="cx"> Environment::Environment()
</span><span class="cx"> : m_isBmallocEnabled(computeIsBmallocEnabled())
</span><span class="cx"> {
</span><span class="lines">@@ -80,6 +98,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (isLibgmallocEnabled())
</span><span class="cx"> return false;
</span><ins>+ if (isASanEnabled())
+ return false;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>