<!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>[210410] branches/safari-603-branch</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/210410">210410</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-05 17:48:14 -0800 (Thu, 05 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210115">r210115</a>. rdar://problem/29793220</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchJSTestsChangeLog">branches/safari-603-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchJSTestswasmyaml">branches/safari-603-branch/JSTests/wasm.yaml</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreChangeLog">branches/safari-603-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCorewasmWasmB3IRGeneratorcpp">branches/safari-603-branch/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/JSTests/ChangeLog (210409 => 210410)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/JSTests/ChangeLog 2017-01-06 01:48:11 UTC (rev 210409)
+++ branches/safari-603-branch/JSTests/ChangeLog 2017-01-06 01:48:14 UTC (rev 210410)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210115. rdar://problem/29793220
+
+ 2016-12-22 Saam Barati <sbarati@apple.com>
+
+ WebAssembly: Make the spec-tests/address.wast.js test pass
+ https://bugs.webkit.org/show_bug.cgi?id=166429
+ <rdar://problem/29793220>
+
+ Reviewed by Keith Miller.
+
+ * wasm.yaml:
+
+2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210111. rdar://problem/29791695
</span><span class="cx">
</span><span class="cx"> 2016-12-22 Keith Miller <keith_miller@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchJSTestswasmyaml"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/JSTests/wasm.yaml (210409 => 210410)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/JSTests/wasm.yaml 2017-01-06 01:48:11 UTC (rev 210409)
+++ branches/safari-603-branch/JSTests/wasm.yaml 2017-01-06 01:48:14 UTC (rev 210410)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> cmd: runWebAssembly
</span><span class="cx">
</span><span class="cx"> - path: wasm/spec-tests/address.wast.js
</span><del>- cmd: runWebAssemblySpecTest :skip
</del><ins>+ cmd: runWebAssemblySpecTest :normal
</ins><span class="cx">
</span><span class="cx"> - path: wasm/spec-tests/binary.wast.js
</span><span class="cx"> cmd: runWebAssemblySpecTest :normal
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/ChangeLog (210409 => 210410)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-01-06 01:48:11 UTC (rev 210409)
+++ branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-01-06 01:48:14 UTC (rev 210410)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210115. rdar://problem/29793220
+
+ 2016-12-22 Saam Barati <sbarati@apple.com>
+
+ WebAssembly: Make the spec-tests/address.wast.js test pass
+ https://bugs.webkit.org/show_bug.cgi?id=166429
+ <rdar://problem/29793220>
+
+ Reviewed by Keith Miller.
+
+ Right now, provably out of bound loads/stores (given a load/store's constant
+ offset) are not a validation error. However, we were failing to catch uint32_t
+ overflows in release builds (we did have a debug assertion). To fix this,
+ I now detect when uint32_t addition will overflow, and instead of emitting
+ a normal load/store, I emit code that throws an out of bounds memory exception.
+
+ * wasm/WasmB3IRGenerator.cpp:
+
+2017-01-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210111. rdar://problem/29791695
</span><span class="cx">
</span><span class="cx"> 2016-12-22 Keith Miller <keith_miller@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCorewasmWasmB3IRGeneratorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp (210409 => 210410)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp 2017-01-06 01:48:11 UTC (rev 210409)
+++ branches/safari-603-branch/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp 2017-01-06 01:48:14 UTC (rev 210410)
</span><span class="lines">@@ -465,7 +465,42 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(pointer->type() == Int32);
</span><span class="cx">
</span><del>- result = emitLoadOp(op, Origin(), emitCheckAndPreparePointer(pointer, offset, sizeOfLoadOp(op)), offset);
</del><ins>+ if (UNLIKELY(sumOverflows<uint32_t>(offset, sizeOfLoadOp(op)))) {
+ // FIXME: Even though this is provably out of bounds, it's not a validation error, so we have to handle it
+ // as a runtime exception. However, this may change: https://bugs.webkit.org/show_bug.cgi?id=166435
+ B3::PatchpointValue* throwException = m_currentBlock->appendNew<B3::PatchpointValue>(m_proc, B3::Void, Origin());
+ throwException->setGenerator([this] (CCallHelpers& jit, const B3::StackmapGenerationParams&) {
+ this->emitExceptionCheck(jit, ExceptionType::OutOfBoundsMemoryAccess);
+ });
+
+ switch (op) {
+ case LoadOpType::I32Load8S:
+ case LoadOpType::I32Load16S:
+ case LoadOpType::I32Load:
+ case LoadOpType::I32Load16U:
+ case LoadOpType::I32Load8U:
+ result = zeroForType(I32);
+ break;
+ case LoadOpType::I64Load8S:
+ case LoadOpType::I64Load8U:
+ case LoadOpType::I64Load16S:
+ case LoadOpType::I64Load32U:
+ case LoadOpType::I64Load32S:
+ case LoadOpType::I64Load:
+ case LoadOpType::I64Load16U:
+ result = zeroForType(I64);
+ break;
+ case LoadOpType::F32Load:
+ result = zeroForType(F32);
+ break;
+ case LoadOpType::F64Load:
+ result = zeroForType(F64);
+ break;
+ }
+
+ } else
+ result = emitLoadOp(op, Origin(), emitCheckAndPreparePointer(pointer, offset, sizeOfLoadOp(op)), offset);
+
</ins><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -527,7 +562,16 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(pointer->type() == Int32);
</span><span class="cx">
</span><del>- emitStoreOp(op, Origin(), emitCheckAndPreparePointer(pointer, offset, sizeOfStoreOp(op)), value, offset);
</del><ins>+ if (UNLIKELY(sumOverflows<uint32_t>(offset, sizeOfStoreOp(op)))) {
+ // FIXME: Even though this is provably out of bounds, it's not a validation error, so we have to handle it
+ // as a runtime exception. However, this may change: https://bugs.webkit.org/show_bug.cgi?id=166435
+ B3::PatchpointValue* throwException = m_currentBlock->appendNew<B3::PatchpointValue>(m_proc, B3::Void, Origin());
+ throwException->setGenerator([this] (CCallHelpers& jit, const B3::StackmapGenerationParams&) {
+ this->emitExceptionCheck(jit, ExceptionType::OutOfBoundsMemoryAccess);
+ });
+ } else
+ emitStoreOp(op, Origin(), emitCheckAndPreparePointer(pointer, offset, sizeOfStoreOp(op)), value, offset);
+
</ins><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>