<!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>[177995] trunk</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/177995">177995</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 14:24:15 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ADDRESS_SANITIZER macro is overloaded
https://bugs.webkit.org/show_bug.cgi?id=140130
Reviewed by Anders Carlsson.
Source/JavaScriptCore:
* interpreter/JSStack.cpp: (JSC::JSStack::sanitizeStack): Use the new macro.
This code is nearly unused (only compiled in when JIT is disabled at build time),
however I've been told that it's best to keep it.
Source/WebCore:
* platform/RefCountedSupplement.h:
* platform/Supplementable.h:
Change the conditional to ENABLE(SECURITY_ASSERTIONS). These checks will be used
in debug builds, and also when one explicitly passes -DENABLE_SECURITY_ASSERTIONS.
Source/WTF:
* wtf/Compiler.h: Added an ASAN_ENABLED macro. The abbreviation should become well
known - we already use it in tools.
* wtf/Assertions.h:
* wtf/RefCounted.h:
* wtf/SizeLimits.cpp:
Change the conditional to ENABLE(SECURITY_ASSERTIONS). These checks will be used
in debug builds, and also when one explicitly passes -DENABLE_SECURITY_ASSERTIONS.
Tools:
* WebKitTestRunner/TestController.cpp: Use the new macro.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterJSStackcpp">trunk/Source/JavaScriptCore/interpreter/JSStack.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfAssertionsh">trunk/Source/WTF/wtf/Assertions.h</a></li>
<li><a href="#trunkSourceWTFwtfCompilerh">trunk/Source/WTF/wtf/Compiler.h</a></li>
<li><a href="#trunkSourceWTFwtfRefCountedh">trunk/Source/WTF/wtf/RefCounted.h</a></li>
<li><a href="#trunkSourceWTFwtfSizeLimitscpp">trunk/Source/WTF/wtf/SizeLimits.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformRefCountedSupplementh">trunk/Source/WebCore/platform/RefCountedSupplement.h</a></li>
<li><a href="#trunkSourceWebCoreplatformSupplementableh">trunk/Source/WebCore/platform/Supplementable.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (177994 => 177995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-06 21:58:12 UTC (rev 177994)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-06 22:24:15 UTC (rev 177995)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-06 Alexey Proskuryakov <ap@apple.com>
+
+ ADDRESS_SANITIZER macro is overloaded
+ https://bugs.webkit.org/show_bug.cgi?id=140130
+
+ Reviewed by Anders Carlsson.
+
+ * interpreter/JSStack.cpp: (JSC::JSStack::sanitizeStack): Use the new macro.
+ This code is nearly unused (only compiled in when JIT is disabled at build time),
+ however I've been told that it's best to keep it.
+
</ins><span class="cx"> 2015-01-06 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix Use details for op_create_arguments.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterJSStackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/JSStack.cpp (177994 => 177995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/JSStack.cpp 2015-01-06 21:58:12 UTC (rev 177994)
+++ trunk/Source/JavaScriptCore/interpreter/JSStack.cpp 2015-01-06 22:24:15 UTC (rev 177995)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> void JSStack::sanitizeStack()
</span><span class="cx"> {
</span><del>-#if !defined(ADDRESS_SANITIZER)
</del><ins>+#if !ASAN_ENABLED
</ins><span class="cx"> ASSERT(topOfStack() <= baseOfStack());
</span><span class="cx">
</span><span class="cx"> if (m_lastStackTop < topOfStack()) {
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (177994 => 177995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-01-06 21:58:12 UTC (rev 177994)
+++ trunk/Source/WTF/ChangeLog 2015-01-06 22:24:15 UTC (rev 177995)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-01-06 Alexey Proskuryakov <ap@apple.com>
+
+ ADDRESS_SANITIZER macro is overloaded
+ https://bugs.webkit.org/show_bug.cgi?id=140130
+
+ Reviewed by Anders Carlsson.
+
+ * wtf/Compiler.h: Added an ASAN_ENABLED macro. The abbreviation should become well
+ known - we already use it in tools.
+
+ * wtf/Assertions.h:
+ * wtf/RefCounted.h:
+ * wtf/SizeLimits.cpp:
+ Change the conditional to ENABLE(SECURITY_ASSERTIONS). These checks will be used
+ in debug builds, and also when one explicitly passes -DENABLE_SECURITY_ASSERTIONS.
+
</ins><span class="cx"> 2015-01-05 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Purge PassRefPtr from Page.
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.h (177994 => 177995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.h 2015-01-06 21:58:12 UTC (rev 177994)
+++ trunk/Source/WTF/wtf/Assertions.h 2015-01-06 22:24:15 UTC (rev 177995)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx">
</span><span class="cx"> #define ASSERT_UNUSED(variable, assertion) ((void)variable)
</span><span class="cx">
</span><del>-#ifdef ADDRESS_SANITIZER
</del><ins>+#if ENABLE(SECURITY_ASSERTIONS)
</ins><span class="cx"> #define ASSERT_WITH_SECURITY_IMPLICATION(assertion) \
</span><span class="cx"> (!(assertion) ? \
</span><span class="cx"> (WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, #assertion), \
</span></span></pre></div>
<a id="trunkSourceWTFwtfCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Compiler.h (177994 => 177995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Compiler.h 2015-01-06 21:58:12 UTC (rev 177994)
+++ trunk/Source/WTF/wtf/Compiler.h 2015-01-06 22:24:15 UTC (rev 177995)
</span><span class="lines">@@ -136,6 +136,12 @@
</span><span class="cx"> #define WTF_COMPILER_SUPPORTS_EABI 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(__has_feature)
+#define ASAN_ENABLED __has_feature(address_sanitizer)
+#else
+#define ASAN_ENABLED false
+#endif
+
</ins><span class="cx"> /* ==== Compiler-independent macros for various compiler features, in alphabetical order ==== */
</span><span class="cx">
</span><span class="cx"> /* ALWAYS_INLINE */
</span></span></pre></div>
<a id="trunkSourceWTFwtfRefCountedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RefCounted.h (177994 => 177995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RefCounted.h 2015-01-06 21:58:12 UTC (rev 177994)
+++ trunk/Source/WTF/wtf/RefCounted.h 2015-01-06 22:24:15 UTC (rev 177995)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>-#if defined(NDEBUG) && !defined(ADDRESS_SANITIZER)
</del><ins>+#if defined(NDEBUG) && !ENABLE(SECURITY_ASSERTIONS)
</ins><span class="cx"> #define CHECK_REF_COUNTED_LIFECYCLE 0
</span><span class="cx"> #else
</span><span class="cx"> #define CHECK_REF_COUNTED_LIFECYCLE 1
</span></span></pre></div>
<a id="trunkSourceWTFwtfSizeLimitscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/SizeLimits.cpp (177994 => 177995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/SizeLimits.cpp 2015-01-06 21:58:12 UTC (rev 177994)
+++ trunk/Source/WTF/wtf/SizeLimits.cpp 2015-01-06 22:24:15 UTC (rev 177995)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>-#if !defined(NDEBUG) || defined(ADDRESS_SANITIZER)
</del><ins>+#if !defined(NDEBUG) || ENABLE(SECURITY_ASSERTIONS)
</ins><span class="cx"> struct SameSizeAsRefCounted {
</span><span class="cx"> int a;
</span><span class="cx"> bool b;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177994 => 177995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-06 21:58:12 UTC (rev 177994)
+++ trunk/Source/WebCore/ChangeLog 2015-01-06 22:24:15 UTC (rev 177995)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-06 Alexey Proskuryakov <ap@apple.com>
+
+ ADDRESS_SANITIZER macro is overloaded
+ https://bugs.webkit.org/show_bug.cgi?id=140130
+
+ Reviewed by Anders Carlsson.
+
+ * platform/RefCountedSupplement.h:
+ * platform/Supplementable.h:
+ Change the conditional to ENABLE(SECURITY_ASSERTIONS). These checks will be used
+ in debug builds, and also when one explicitly passes -DENABLE_SECURITY_ASSERTIONS.
+
</ins><span class="cx"> 2015-01-06 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: pass parameters to inspector agents by reference where possible
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformRefCountedSupplementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/RefCountedSupplement.h (177994 => 177995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/RefCountedSupplement.h 2015-01-06 21:58:12 UTC (rev 177994)
+++ trunk/Source/WebCore/platform/RefCountedSupplement.h 2015-01-06 22:24:15 UTC (rev 177995)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> public:
</span><span class="cx"> explicit Wrapper(PassRefPtr<ThisType> wrapped) : m_wrapped(wrapped) { }
</span><span class="cx"> virtual ~Wrapper() { m_wrapped->hostDestroyed(); }
</span><del>-#if !ASSERT_DISABLED || defined(ADDRESS_SANITIZER)
</del><ins>+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
</ins><span class="cx"> virtual bool isRefCountedWrapper() const override { return true; }
</span><span class="cx"> #endif
</span><span class="cx"> ThisType* wrapped() const { return m_wrapped.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSupplementableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Supplementable.h (177994 => 177995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Supplementable.h 2015-01-06 21:58:12 UTC (rev 177994)
+++ trunk/Source/WebCore/platform/Supplementable.h 2015-01-06 22:24:15 UTC (rev 177995)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> class Supplement {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~Supplement() { }
</span><del>-#if !ASSERT_DISABLED || defined(ADDRESS_SANITIZER)
</del><ins>+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
</ins><span class="cx"> virtual bool isRefCountedWrapper() const { return false; }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (177994 => 177995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-06 21:58:12 UTC (rev 177994)
+++ trunk/Tools/ChangeLog 2015-01-06 22:24:15 UTC (rev 177995)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-01-06 Alexey Proskuryakov <ap@apple.com>
+
+ ADDRESS_SANITIZER macro is overloaded
+ https://bugs.webkit.org/show_bug.cgi?id=140130
+
+ Reviewed by Anders Carlsson.
+
+ * WebKitTestRunner/TestController.cpp: Use the new macro.
+
</ins><span class="cx"> 2015-01-05 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove some stale class names in check-for-inappropriate-objc-class-names
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (177994 => 177995)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-01-06 21:58:12 UTC (rev 177994)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-01-06 22:24:15 UTC (rev 177995)
</span><span class="lines">@@ -70,15 +70,11 @@
</span><span class="cx"> const unsigned TestController::w3cSVGViewWidth = 480;
</span><span class="cx"> const unsigned TestController::w3cSVGViewHeight = 360;
</span><span class="cx">
</span><del>-#if defined(__has_feature)
-#if __has_feature(address_sanitizer)
</del><ins>+#if ASAN_ENABLED
</ins><span class="cx"> const double TestController::shortTimeout = 10.0;
</span><span class="cx"> #else
</span><span class="cx"> const double TestController::shortTimeout = 5.0;
</span><span class="cx"> #endif
</span><del>-#else
-const double TestController::shortTimeout = 5.0;
-#endif
</del><span class="cx">
</span><span class="cx"> const double TestController::noTimeout = -1;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>