<!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>[210769] 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/210769">210769</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-01-14 11:35:23 -0800 (Sat, 14 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebAssembly: Suppress warnings & errors in GCC
https://bugs.webkit.org/show_bug.cgi?id=167049
Reviewed by Sam Weinig.
Source/JavaScriptCore:
* wasm/WasmFunctionParser.h:
Add missing { } after the switch. Ideally, it is not necessary.
But in GCC, it is required. Since this function is fairly large,
I think the code generated by this does not cause performance
regression.
* wasm/WasmPageCount.h:
UINT_MAX is defined in limits.h.
* wasm/generateWasmValidateInlinesHeader.py:
On the other hand, we use this suppress pragma here to solve the
same problem in wasm/WasmFunctionParser.h. Since the load function
is fairly small, the additional `return { };` may generate some
suboptimal code. See bug 150794 for more detail.
Source/WTF:
* wtf/LEBDecoder.h:
(WTF::LEBDecoder::decodeInt):
If T = int, it performs `-1 << shift`. It causes
warning in GCC. Instead, we first cast it to the
UnsignedT, perform operation and re-cast to the
T.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmFunctionParserh">trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmPageCounth">trunk/Source/JavaScriptCore/wasm/WasmPageCount.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmgenerateWasmValidateInlinesHeaderpy">trunk/Source/JavaScriptCore/wasm/generateWasmValidateInlinesHeader.py</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfLEBDecoderh">trunk/Source/WTF/wtf/LEBDecoder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (210768 => 210769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-01-14 18:45:20 UTC (rev 210768)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-01-14 19:35:23 UTC (rev 210769)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2017-01-14 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><ins>+ WebAssembly: Suppress warnings & errors in GCC
+ https://bugs.webkit.org/show_bug.cgi?id=167049
+
+ Reviewed by Sam Weinig.
+
+ * wasm/WasmFunctionParser.h:
+ Add missing { } after the switch. Ideally, it is not necessary.
+ But in GCC, it is required. Since this function is fairly large,
+ I think the code generated by this does not cause performance
+ regression.
+
+ * wasm/WasmPageCount.h:
+ UINT_MAX is defined in limits.h.
+
+ * wasm/generateWasmValidateInlinesHeader.py:
+ On the other hand, we use this suppress pragma here to solve the
+ same problem in wasm/WasmFunctionParser.h. Since the load function
+ is fairly small, the additional `return { };` may generate some
+ suboptimal code. See bug 150794 for more detail.
+
+2017-01-14 Yusuke Suzuki <utatane.tea@gmail.com>
+
</ins><span class="cx"> Reserve capacity for StringBuilder in unescape
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=167008
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmFunctionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h (210768 => 210769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h 2017-01-14 18:45:20 UTC (rev 210768)
+++ trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h 2017-01-14 19:35:23 UTC (rev 210769)
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> if (result != Context::emptyExpression)
</span><span class="cx"> m_expressionStack.append(result);
</span><span class="cx">
</span><del>- return { };
</del><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case CallIndirect: {
</span><span class="lines">@@ -511,6 +511,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><ins>+ return { };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: We should try to use the same decoder function for both unreachable and reachable code. https://bugs.webkit.org/show_bug.cgi?id=165965
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmPageCounth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmPageCount.h (210768 => 210769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmPageCount.h 2017-01-14 18:45:20 UTC (rev 210768)
+++ trunk/Source/JavaScriptCore/wasm/WasmPageCount.h 2017-01-14 19:35:23 UTC (rev 210769)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBASSEMBLY)
</span><span class="cx">
</span><ins>+#include <limits.h>
+
</ins><span class="cx"> namespace WTF {
</span><span class="cx"> class PrintStream;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmgenerateWasmValidateInlinesHeaderpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/generateWasmValidateInlinesHeader.py (210768 => 210769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/generateWasmValidateInlinesHeader.py 2017-01-14 18:45:20 UTC (rev 210768)
+++ trunk/Source/JavaScriptCore/wasm/generateWasmValidateInlinesHeader.py 2017-01-14 19:35:23 UTC (rev 210769)
</span><span class="lines">@@ -125,6 +125,13 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBASSEMBLY)
</span><span class="cx">
</span><ins>+#include <wtf/StdLibExtras.h>
+
+#if COMPILER(GCC) && ASSERT_DISABLED
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wreturn-type"
+#endif // COMPILER(GCC) && ASSERT_DISABLED
+
</ins><span class="cx"> namespace JSC { namespace Wasm {
</span><span class="cx">
</span><span class="cx"> """ + unarySpecializations + binarySpecializations + """
</span><span class="lines">@@ -151,6 +158,10 @@
</span><span class="cx">
</span><span class="cx"> } } // namespace JSC::Wasm
</span><span class="cx">
</span><ins>+#if COMPILER(GCC) && ASSERT_DISABLED
+#pragma GCC diagnostic pop
+#endif // COMPILER(GCC) && ASSERT_DISABLED
+
</ins><span class="cx"> #endif // ENABLE(WEBASSEMBLY)
</span><span class="cx">
</span><span class="cx"> """
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (210768 => 210769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-01-14 18:45:20 UTC (rev 210768)
+++ trunk/Source/WTF/ChangeLog 2017-01-14 19:35:23 UTC (rev 210769)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-01-14 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ WebAssembly: Suppress warnings & errors in GCC
+ https://bugs.webkit.org/show_bug.cgi?id=167049
+
+ Reviewed by Sam Weinig.
+
+ * wtf/LEBDecoder.h:
+ (WTF::LEBDecoder::decodeInt):
+ If T = int, it performs `-1 << shift`. It causes
+ warning in GCC. Instead, we first cast it to the
+ UnsignedT, perform operation and re-cast to the
+ T.
+
</ins><span class="cx"> 2017-01-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(DETAILS_ELEMENT) guards
</span></span></pre></div>
<a id="trunkSourceWTFwtfLEBDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/LEBDecoder.h (210768 => 210769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/LEBDecoder.h 2017-01-14 18:45:20 UTC (rev 210768)
+++ trunk/Source/WTF/wtf/LEBDecoder.h 2017-01-14 19:35:23 UTC (rev 210769)
</span><span class="lines">@@ -78,8 +78,9 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ using UnsignedT = typename std::make_unsigned<T>::type;
</ins><span class="cx"> if (shift < numBits && (byte & 0x40))
</span><del>- result |= static_cast<T>(-1) << shift;
</del><ins>+ result = static_cast<T>(static_cast<UnsignedT>(result) | (static_cast<UnsignedT>(-1) << shift));
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>