<!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>[150196] 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/150196">150196</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2013-05-16 12:03:16 -0700 (Thu, 16 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Crash properly on iOS
https://bugs.webkit.org/show_bug.cgi?id=115782

Reviewed by Darin Adler.

Improve crash handling. &lt;rdar://problem/13842771&gt;

* wtf/Assertions.cpp:
* wtf/Assertions.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcprojJavaScriptCoreJavaScriptCoreExportsdef">trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreExports.def</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreExportGeneratorJavaScriptCoreExportsdefin">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExports.def.in</a></li>
<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="trunkSourceJavaScriptCoreJavaScriptCorevcprojJavaScriptCoreJavaScriptCoreExportsdef"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreExports.def (150195 => 150196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreExports.def        2013-05-16 19:00:36 UTC (rev 150195)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreExports.def        2013-05-16 19:03:16 UTC (rev 150196)
</span><span class="lines">@@ -555,8 +555,8 @@
</span><span class="cx">     ?writeBarrier@HandleSet@JSC@@QAEXPAVJSValue@2@ABV32@@Z
</span><span class="cx">     ?yield@WTF@@YAXXZ
</span><span class="cx">     ?zeroTime@MediaTime@WTF@@SAABV12@XZ
</span><ins>+    WTFCrash
</ins><span class="cx">     WTFGetBacktrace
</span><del>-    WTFInvokeCrashHook
</del><span class="cx">     WTFLog
</span><span class="cx">     WTFLogAlways
</span><span class="cx">     WTFLogVerbose
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreExportGeneratorJavaScriptCoreExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExports.def.in (150195 => 150196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExports.def.in        2013-05-16 19:00:36 UTC (rev 150195)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExports.def.in        2013-05-16 19:03:16 UTC (rev 150196)
</span><span class="lines">@@ -554,8 +554,8 @@
</span><span class="cx">     ?writeBarrier@HandleSet@JSC@@QAEXPAVJSValue@2@ABV32@@Z
</span><span class="cx">     ?yield@WTF@@YAXXZ
</span><span class="cx">     ?zeroTime@MediaTime@WTF@@SAABV12@XZ
</span><ins>+    WTFCrash
</ins><span class="cx">     WTFGetBacktrace
</span><del>-    WTFInvokeCrashHook
</del><span class="cx">     WTFLog
</span><span class="cx">     WTFLogAlways
</span><span class="cx">     WTFLogVerbose
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (150195 => 150196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog        2013-05-16 19:00:36 UTC (rev 150195)
+++ trunk/Source/WTF/ChangeLog        2013-05-16 19:03:16 UTC (rev 150196)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-05-16  Benjamin Poulain  &lt;benjamin@webkit.org&gt;
+
+        Crash properly on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=115782
+
+        Reviewed by Darin Adler.
+
+        Improve crash handling. &lt;rdar://problem/13842771&gt;
+
+        * wtf/Assertions.cpp:
+        * wtf/Assertions.h:
+
</ins><span class="cx"> 2013-05-15  Ryuan Choi  &lt;ryuan.choi@samsung.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed build fix after r150123
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.cpp (150195 => 150196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.cpp        2013-05-16 19:00:36 UTC (rev 150195)
+++ trunk/Source/WTF/wtf/Assertions.cpp        2013-05-16 19:03:16 UTC (rev 150196)
</span><span class="lines">@@ -326,10 +326,19 @@
</span><span class="cx">     globalHook = function;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WTFInvokeCrashHook()
</del><ins>+void WTFCrash()
</ins><span class="cx"> {
</span><span class="cx">     if (globalHook)
</span><span class="cx">         globalHook();
</span><ins>+
+    WTFReportBacktrace();
+    *(int *)(uintptr_t)0xbbadbeef = 0;
+    // More reliable, but doesn't say BBADBEEF.
+#if COMPILER(CLANG)
+    __builtin_trap();
+#else
+    ((void(*)())0)();
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if HAVE(SIGNAL_H)
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.h (150195 => 150196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.h        2013-05-16 19:00:36 UTC (rev 150195)
+++ trunk/Source/WTF/wtf/Assertions.h        2013-05-16 19:03:16 UTC (rev 150196)
</span><span class="lines">@@ -123,7 +123,6 @@
</span><span class="cx"> 
</span><span class="cx"> typedef void (*WTFCrashHookFunction)();
</span><span class="cx"> WTF_EXPORT_PRIVATE void WTFSetCrashHook(WTFCrashHookFunction);
</span><del>-WTF_EXPORT_PRIVATE void WTFInvokeCrashHook();
</del><span class="cx"> WTF_EXPORT_PRIVATE void WTFInstallReportBacktraceOnCrashHook();
</span><span class="cx"> 
</span><span class="cx"> #ifdef __cplusplus
</span><span class="lines">@@ -138,30 +137,24 @@
</span><span class="cx"> 
</span><span class="cx">    Signals are ignored by the crash reporter on OS X so we must do better.
</span><span class="cx"> */
</span><del>-#ifndef CRASH
</del><span class="cx"> #if COMPILER(CLANG)
</span><del>-#define CRASH() \
-    (WTFReportBacktrace(), \
-     WTFInvokeCrashHook(), \
-     (*(int *)(uintptr_t)0xbbadbeef = 0), \
-     __builtin_trap())
-#else
-#define CRASH() \
-    (WTFReportBacktrace(), \
-     WTFInvokeCrashHook(), \
-     (*(int *)(uintptr_t)0xbbadbeef = 0), \
-     ((void(*)())0)() /* More reliable, but doesn't say BBADBEEF */ \
-    )
-#endif
-#endif
-
-#if COMPILER(CLANG)
</del><span class="cx"> #define NO_RETURN_DUE_TO_CRASH NO_RETURN
</span><span class="cx"> #else
</span><span class="cx"> #define NO_RETURN_DUE_TO_CRASH
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#ifndef CRASH
+#define CRASH() WTFCrash()
+#endif
</ins><span class="cx"> 
</span><ins>+#ifdef __cplusplus
+extern &quot;C&quot; {
+#endif
+WTF_EXPORT_PRIVATE void WTFCrash() NO_RETURN_DUE_TO_CRASH;
+#ifdef __cplusplus
+}
+#endif
+
</ins><span class="cx"> /* BACKTRACE
</span><span class="cx"> 
</span><span class="cx">   Print a backtrace to the same location as ASSERT messages.
</span></span></pre>
</div>
</div>

</body>
</html>