<!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>[171482] 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/171482">171482</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-07-23 11:18:34 -0700 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>../JavaScriptCore: [Win] Use NO_RETURN_DUE_TO_CRASH on Windows
https://bugs.webkit.org/show_bug.cgi?id=135199
Reviewed by Mark Lam.
* jsc.cpp:
(WTF::RuntimeArray::deleteProperty): Stop using ugly
compiler work-around on Windows; use NO_RETURN_DUE_TO_CRASH
codepath instead.
* runtime/Identifier.h: Add NO_RETURN_DUE_TO_CRASH
to header so function declaration matches implementation.
../WebCore: [Win] Use NO_RETURN_DUE_TO_CRASH on Windows.
https://bugs.webkit.org/show_bug.cgi?id=13519
Reviewed by Mark Lam.
* svg/SVGZoomAndPan.h: Add NO_RETURN_DUE_TO_CRASH to
header so function declarations match implementation.
../WTF: [Win] Use NO_RETURN_DUE_TO_CRASH on Windows.
https://bugs.webkit.org/show_bug.cgi?id=13519
Reviewed by Mark Lam.
* wtf/Assertions.h: Add MSVC to list of compilers supporting this macro.
* wtf/FastMalloc.cpp: Correct function declaration for NO_RETURN_DUE_TO_CRASH.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIdentifierh">trunk/Source/JavaScriptCore/runtime/Identifier.h</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="#trunkSourceWTFwtfFastMalloccpp">trunk/Source/WTF/wtf/FastMalloc.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoresvgSVGZoomAndPanh">trunk/Source/WebCore/svg/SVGZoomAndPan.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (171481 => 171482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-07-23 18:18:34 UTC (rev 171482)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-07-23 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Use NO_RETURN_DUE_TO_CRASH on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=135199
+
+ Reviewed by Mark Lam.
+
+ * jsc.cpp:
+ (WTF::RuntimeArray::deleteProperty): Stop using ugly
+ compiler work-around on Windows; use NO_RETURN_DUE_TO_CRASH
+ codepath instead.
+ * runtime/Identifier.h: Add NO_RETURN_DUE_TO_CRASH
+ to header so function declaration matches implementation.
+
</ins><span class="cx"> 2014-07-23 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> Remove CSS_EXCLUSIONS compile flag and leftover code
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (171481 => 171482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2014-07-23 18:18:34 UTC (rev 171482)
</span><span class="lines">@@ -356,7 +356,7 @@
</span><span class="cx"> static NO_RETURN_DUE_TO_CRASH bool deleteProperty(JSCell*, ExecState*, PropertyName)
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><del>-#if !COMPILER(CLANG)
</del><ins>+#if !COMPILER(CLANG) && !COMPILER(MSVC)
</ins><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Identifier.h (171481 => 171482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Identifier.h 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/JavaScriptCore/runtime/Identifier.h 2014-07-23 18:18:34 UTC (rev 171482)
</span><span class="lines">@@ -113,8 +113,8 @@
</span><span class="cx"> static PassRef<StringImpl> add(ExecState*, StringImpl*);
</span><span class="cx"> static PassRef<StringImpl> add(VM*, StringImpl*);
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE static void checkCurrentAtomicStringTable(ExecState*);
- JS_EXPORT_PRIVATE static void checkCurrentAtomicStringTable(VM*);
</del><ins>+ JS_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH static void checkCurrentAtomicStringTable(ExecState*);
+ JS_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH static void checkCurrentAtomicStringTable(VM*);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <> ALWAYS_INLINE bool Identifier::canUseSingleCharacterString(LChar)
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (171481 => 171482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/WTF/ChangeLog 2014-07-23 18:18:34 UTC (rev 171482)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-07-23 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Use NO_RETURN_DUE_TO_CRASH on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=13519
+
+ Reviewed by Mark Lam.
+
+ * wtf/Assertions.h: Add MSVC to list of compilers supporting this macro.
+ * wtf/FastMalloc.cpp: Correct function declaration for NO_RETURN_DUE_TO_CRASH.
+
</ins><span class="cx"> 2014-07-22 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r169148, r169185, r169188, r169578, r169582, r169584, r169588, r169753 from ftlopt.
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.h (171481 => 171482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Assertions.h 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/WTF/wtf/Assertions.h 2014-07-23 18:18:34 UTC (rev 171482)
</span><span class="lines">@@ -111,7 +111,7 @@
</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>-#if COMPILER(CLANG)
</del><ins>+#if COMPILER(CLANG) || COMPILER(MSVC)
</ins><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="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE void WTFLogVerbose(const char* file, int line, const char* function, WTFLogChannel*, const char* format, ...) WTF_ATTRIBUTE_PRINTF(5, 6);
</span><span class="cx"> WTF_EXPORT_PRIVATE void WTFLogAlwaysV(const char* format, va_list);
</span><span class="cx"> WTF_EXPORT_PRIVATE void WTFLogAlways(const char* format, ...) WTF_ATTRIBUTE_PRINTF(1, 2);
</span><del>-WTF_EXPORT_PRIVATE void WTFLogAlwaysAndCrash(const char* format, ...) WTF_ATTRIBUTE_PRINTF(1, 2) NO_RETURN_DUE_TO_CRASH;
</del><ins>+WTF_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH void WTFLogAlwaysAndCrash(const char* format, ...) WTF_ATTRIBUTE_PRINTF(1, 2);
</ins><span class="cx"> WTF_EXPORT_PRIVATE WTFLogChannel* WTFLogChannelByName(WTFLogChannel*[], size_t count, const char*);
</span><span class="cx"> WTF_EXPORT_PRIVATE void WTFInitializeLogChannelStatesFromString(WTFLogChannel*[], size_t count, const char*);
</span><span class="cx">
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span><del>-WTF_EXPORT_PRIVATE void WTFCrash() NO_RETURN_DUE_TO_CRASH;
</del><ins>+ WTF_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH void WTFCrash();
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span><del>- WTF_EXPORT_PRIVATE void WTFCrashWithSecurityImplication() NO_RETURN_DUE_TO_CRASH;
</del><ins>+ WTF_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH void WTFCrashWithSecurityImplication();
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWTFwtfFastMalloccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (171481 => 171482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.cpp 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2014-07-23 18:18:34 UTC (rev 171482)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Internal {
</span><span class="cx"> #if !ENABLE(WTF_MALLOC_VALIDATION)
</span><del>-WTF_EXPORT_PRIVATE void fastMallocMatchFailed(void*);
</del><ins>+WTF_EXPORT_PRIVATE NO_RETURN_DUE_TO_CRASH void fastMallocMatchFailed(void*);
</ins><span class="cx"> #else
</span><span class="cx"> COMPILE_ASSERT(((sizeof(ValidationHeader) % sizeof(AllocAlignmentInteger)) == 0), ValidationHeader_must_produce_correct_alignment);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171481 => 171482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/WebCore/ChangeLog 2014-07-23 18:18:34 UTC (rev 171482)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-07-23 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Use NO_RETURN_DUE_TO_CRASH on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=13519
+
+ Reviewed by Mark Lam.
+
+ * svg/SVGZoomAndPan.h: Add NO_RETURN_DUE_TO_CRASH to
+ header so function declarations match implementation.
+
</ins><span class="cx"> 2014-07-23 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> JSDOMWindowShell leaks on pages with media elements
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGZoomAndPanh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGZoomAndPan.h (171481 => 171482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGZoomAndPan.h 2014-07-23 17:57:17 UTC (rev 171481)
+++ trunk/Source/WebCore/svg/SVGZoomAndPan.h 2014-07-23 18:18:34 UTC (rev 171482)
</span><span class="lines">@@ -76,9 +76,9 @@
</span><span class="cx">
</span><span class="cx"> // These methods only exist to allow us to compile JSSVGZoomAndPan.*.
</span><span class="cx"> // These are never called, and thus ASSERT_NOT_REACHED.
</span><del>- void ref();
- void deref();
- void setZoomAndPan(unsigned short);
</del><ins>+ NO_RETURN_DUE_TO_ASSERT void ref();
+ NO_RETURN_DUE_TO_ASSERT void deref();
+ NO_RETURN_DUE_TO_ASSERT void setZoomAndPan(unsigned short);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>