<!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>[196554] trunk/Source/WTF</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/196554">196554</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-02-13 14:39:52 -0800 (Sat, 13 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate the need for WTFCrashImpl().
https://bugs.webkit.org/show_bug.cgi?id=154202
Reviewed by Alexey Proskuryakov.
* wtf/Assertions.cpp:
* wtf/Assertions.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfAssertionscpp">trunk/Source/WTF/wtf/Assertions.cpp</a></li>
<li><a href="#trunkSourceWTFwtfAssertionsh">trunk/Source/WTF/wtf/Assertions.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (196553 => 196554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-02-13 21:30:10 UTC (rev 196553)
+++ trunk/Source/WTF/ChangeLog 2016-02-13 22:39:52 UTC (rev 196554)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-02-13 Mark Lam <mark.lam@apple.com>
+
+ Eliminate the need for WTFCrashImpl().
+ https://bugs.webkit.org/show_bug.cgi?id=154202
+
+ Reviewed by Alexey Proskuryakov.
+
+ * wtf/Assertions.cpp:
+ * wtf/Assertions.h:
+
</ins><span class="cx"> 2016-02-12 Sukolsak Sakshuwong <sukolsak@gmail.com>
</span><span class="cx">
</span><span class="cx"> Update ICU header files to version 52
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.cpp (196553 => 196554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.cpp 2016-02-13 21:30:10 UTC (rev 196553)
+++ trunk/Source/WTF/wtf/Assertions.cpp 2016-02-13 22:39:52 UTC (rev 196554)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !defined(NDEBUG) || !OS(DARWIN)
</span><del>-void WTFCrashImpl()
</del><ins>+void WTFCrash()
</ins><span class="cx"> {
</span><span class="cx"> if (globalHook)
</span><span class="cx"> globalHook();
</span><span class="lines">@@ -327,8 +327,7 @@
</span><span class="cx"> ((void(*)())0)();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-#endif // !defined(NDEBUG) || !OS(DARWIN)
-
</del><ins>+#else
</ins><span class="cx"> // We need to keep WTFCrash() around (even on non-debug OS(DARWIN) builds) as a workaround
</span><span class="cx"> // for presently shipping (circa early 2016) SafariForWebKitDevelopment binaries which still
</span><span class="cx"> // expects to link to it.
</span><span class="lines">@@ -336,6 +335,7 @@
</span><span class="cx"> {
</span><span class="cx"> CRASH();
</span><span class="cx"> }
</span><ins>+#endif // !defined(NDEBUG) || !OS(DARWIN)
</ins><span class="cx">
</span><span class="cx"> void WTFCrashWithSecurityImplication()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.h (196553 => 196554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.h 2016-02-13 21:30:10 UTC (rev 196553)
+++ trunk/Source/WTF/wtf/Assertions.h 2016-02-13 22:39:52 UTC (rev 196554)
</span><span class="lines">@@ -152,30 +152,31 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE bool WTFIsDebuggerAttached();
</span><span class="cx">
</span><span class="cx"> #ifndef CRASH
</span><del>-#define CRASH() WTFCrashImpl()
-#endif
</del><span class="cx">
</span><span class="cx"> #if defined(NDEBUG) && OS(DARWIN)
</span><del>-ALWAYS_INLINE NO_RETURN_DUE_TO_CRASH void WTFCrashImpl()
-{
- // Crash with a SIGTRAP i.e EXC_BREAKPOINT.
- // We are not using __builtin_trap because it is only guaranteed to abort, but not necessarily
- // trigger a SIGTRAP. Instead, we use inline asm to ensure that we trigger the SIGTRAP.
</del><span class="cx"> #if CPU(X86_64) || CPU(X86)
</span><del>- asm volatile ("int3");
</del><ins>+#define WTFBreakpointTrap() asm volatile ("int3")
</ins><span class="cx"> #elif CPU(ARM_THUMB2)
</span><del>- asm volatile ("bkpt #0");
</del><ins>+#define WTFBreakpointTrap() asm volatile ("bkpt #0")
</ins><span class="cx"> #elif CPU(ARM64)
</span><del>- asm volatile ("brk #0");
</del><ins>+#define WTFBreakpointTrap() asm volatile ("brk #0")
</ins><span class="cx"> #else
</span><span class="cx"> #error "Unsupported CPU".
</span><span class="cx"> #endif
</span><del>- __builtin_unreachable();
-}
</del><ins>+
+// Crash with a SIGTRAP i.e EXC_BREAKPOINT.
+// We are not using __builtin_trap because it is only guaranteed to abort, but not necessarily
+// trigger a SIGTRAP. Instead, we use inline asm to ensure that we trigger the SIGTRAP.
+#define CRASH() do { \
+ WTFBreakpointTrap(); \
+ __builtin_unreachable(); \
+} while (0)
</ins><span class="cx"> #else
</span><del>-WTF_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH void WTFCrashImpl();
</del><ins>+#define CRASH() WTFCrash()
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#endif // CRASH
+
</ins><span class="cx"> WTF_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH void WTFCrash();
</span><span class="cx">
</span><span class="cx"> #ifndef CRASH_WITH_SECURITY_IMPLICATION
</span><span class="lines">@@ -240,17 +241,19 @@
</span><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span><del>-#define ASSERT(assertion) \
- (!(assertion) ? \
- (WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, #assertion), \
- CRASH()) : \
- (void)0)
</del><ins>+#define ASSERT(assertion) do { \
+ if (!(assertion)) { \
+ WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, #assertion); \
+ CRASH(); \
+ } \
+} while (0)
</ins><span class="cx">
</span><del>-#define ASSERT_AT(assertion, file, line, function) \
- (!(assertion) ? \
- (WTFReportAssertionFailure(file, line, function, #assertion), \
- CRASH()) : \
- (void)0)
</del><ins>+#define ASSERT_AT(assertion, file, line, function) do { \
+ if (!(assertion)) { \
+ WTFReportAssertionFailure(file, line, function, #assertion); \
+ CRASH(); \
+ } \
+} while (0)
</ins><span class="cx">
</span><span class="cx"> #define ASSERT_NOT_REACHED() do { \
</span><span class="cx"> WTFReportAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, 0); \
</span><span class="lines">@@ -282,12 +285,12 @@
</span><span class="cx"> #if ASSERT_MSG_DISABLED
</span><span class="cx"> #define ASSERT_WITH_MESSAGE(assertion, ...) ((void)0)
</span><span class="cx"> #else
</span><del>-#define ASSERT_WITH_MESSAGE(assertion, ...) do \
</del><ins>+#define ASSERT_WITH_MESSAGE(assertion, ...) do { \
</ins><span class="cx"> if (!(assertion)) { \
</span><span class="cx"> WTFReportAssertionFailureWithMessage(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, #assertion, __VA_ARGS__); \
</span><span class="cx"> CRASH(); \
</span><span class="cx"> } \
</span><del>-while (0)
</del><ins>+} while (0)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* ASSERT_WITH_MESSAGE_UNUSED */
</span><span class="lines">@@ -295,12 +298,12 @@
</span><span class="cx"> #if ASSERT_MSG_DISABLED
</span><span class="cx"> #define ASSERT_WITH_MESSAGE_UNUSED(variable, assertion, ...) ((void)variable)
</span><span class="cx"> #else
</span><del>-#define ASSERT_WITH_MESSAGE_UNUSED(variable, assertion, ...) do \
</del><ins>+#define ASSERT_WITH_MESSAGE_UNUSED(variable, assertion, ...) do { \
</ins><span class="cx"> if (!(assertion)) { \
</span><span class="cx"> WTFReportAssertionFailureWithMessage(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, #assertion, __VA_ARGS__); \
</span><span class="cx"> CRASH(); \
</span><span class="cx"> } \
</span><del>-while (0)
</del><ins>+} while (0)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -312,12 +315,12 @@
</span><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span><del>-#define ASSERT_ARG(argName, assertion) do \
</del><ins>+#define ASSERT_ARG(argName, assertion) do { \
</ins><span class="cx"> if (!(assertion)) { \
</span><span class="cx"> WTFReportArgumentAssertionFailure(__FILE__, __LINE__, WTF_PRETTY_FUNCTION, #argName, #assertion); \
</span><span class="cx"> CRASH(); \
</span><span class="cx"> } \
</span><del>-while (0)
</del><ins>+} while (0)
</ins><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -371,7 +374,10 @@
</span><span class="cx"> /* RELEASE_ASSERT */
</span><span class="cx">
</span><span class="cx"> #if ASSERT_DISABLED
</span><del>-#define RELEASE_ASSERT(assertion) (UNLIKELY(!(assertion)) ? (CRASH()) : (void)0)
</del><ins>+#define RELEASE_ASSERT(assertion) do { \
+ if (UNLIKELY(!(assertion))) \
+ CRASH(); \
+} while (0)
</ins><span class="cx"> #define RELEASE_ASSERT_WITH_MESSAGE(assertion, ...) RELEASE_ASSERT(assertion)
</span><span class="cx"> #define RELEASE_ASSERT_NOT_REACHED() CRASH()
</span><span class="cx"> #else
</span></span></pre>
</div>
</div>
</body>
</html>