<!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>[213067] trunk</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/213067">213067</a></dd>
<dt>Author</dt> <dd>jfbastien@apple.com</dd>
<dt>Date</dt> <dd>2017-02-27 08:52:46 -0800 (Mon, 27 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebAssembly: miscellaneous spec fixes part deux
https://bugs.webkit.org/show_bug.cgi?id=168861
Reviewed by Keith Miller.
JSTests:
* wasm.yaml: more passing tests
* wasm/Builder.js: use a Map instead of an Object for the function
index space, because Number entries such as 0 were colliding with
string entries such as "0". This in turn requires some hashing of
objects which are inserted, because Map uses Object's insertion
order when comparing.
(export.default.Builder):
(export.default.Builder.prototype._functionIndexSpaceKeyHash):
(export.default.Builder.prototype._registerFunctionToIndexSpace):
(export.default.Builder.prototype._getFunctionFromIndexSpace):
* wasm/js-api/test_Instance.js: add a FIXME test
* wasm/spec-tests/memory.wast.js:
(assert_unlinkable):
* wasm/spec-tests/names.wast.js:
Source/JavaScriptCore:
* wasm/WasmFunctionParser.h: add some FIXME</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestswasmBuilderjs">trunk/JSTests/wasm/Builder.js</a></li>
<li><a href="#trunkJSTestswasmjsapitest_Instancejs">trunk/JSTests/wasm/js-api/test_Instance.js</a></li>
<li><a href="#trunkJSTestswasmspectestsmemorywastjs">trunk/JSTests/wasm/spec-tests/memory.wast.js</a></li>
<li><a href="#trunkJSTestswasmspectestsnameswastjs">trunk/JSTests/wasm/spec-tests/names.wast.js</a></li>
<li><a href="#trunkJSTestswasmyaml">trunk/JSTests/wasm.yaml</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmFunctionParserh">trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (213066 => 213067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2017-02-27 16:29:10 UTC (rev 213066)
+++ trunk/JSTests/ChangeLog 2017-02-27 16:52:46 UTC (rev 213067)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-02-27 JF Bastien <jfbastien@apple.com>
+
+ WebAssembly: miscellaneous spec fixes part deux
+ https://bugs.webkit.org/show_bug.cgi?id=168861
+
+ Reviewed by Keith Miller.
+
+ * wasm.yaml: more passing tests
+ * wasm/Builder.js: use a Map instead of an Object for the function
+ index space, because Number entries such as 0 were colliding with
+ string entries such as "0". This in turn requires some hashing of
+ objects which are inserted, because Map uses Object's insertion
+ order when comparing.
+ (export.default.Builder):
+ (export.default.Builder.prototype._functionIndexSpaceKeyHash):
+ (export.default.Builder.prototype._registerFunctionToIndexSpace):
+ (export.default.Builder.prototype._getFunctionFromIndexSpace):
+ * wasm/js-api/test_Instance.js: add a FIXME test
+ * wasm/spec-tests/memory.wast.js:
+ (assert_unlinkable):
+ * wasm/spec-tests/names.wast.js:
+
</ins><span class="cx"> 2017-02-26 Caio Lima <ticaiolima@gmail.com>
</span><span class="cx">
</span><span class="cx"> op_get_by_id_with_this should use inline caching
</span></span></pre></div>
<a id="trunkJSTestswasmBuilderjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/Builder.js (213066 => 213067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/Builder.js 2017-02-27 16:29:10 UTC (rev 213066)
+++ trunk/JSTests/wasm/Builder.js 2017-02-27 16:52:46 UTC (rev 213067)
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> preamble[p.name] = p.value;
</span><span class="cx"> this.setPreamble(preamble);
</span><span class="cx"> this._sections = [];
</span><del>- this._functionIndexSpace = {};
</del><ins>+ this._functionIndexSpace = new Map();
</ins><span class="cx"> this._functionIndexSpaceCount = 0;
</span><span class="cx"> this._registerSectionBuilders();
</span><span class="cx"> }
</span><span class="lines">@@ -435,18 +435,29 @@
</span><span class="cx"> this._preamble = Object.assign(this._preamble || {}, p);
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><ins>+ _functionIndexSpaceKeyHash(obj) {
+ // We don't need a full hash, just something that has a defined order for Map. Objects we insert aren't nested.
+ if (typeof(obj) !== 'object')
+ return obj;
+ const keys = Object.keys(obj).sort();
+ let entries = [];
+ for (let k in keys)
+ entries.push([k, obj[k]]);
+ return JSON.stringify(entries);
+ }
</ins><span class="cx"> _registerFunctionToIndexSpace(name) {
</span><span class="cx"> if (typeof(name) === "undefined") {
</span><span class="cx"> // Registering a nameless function still adds it to the function index space. Register it as something that can't normally be registered.
</span><span class="cx"> name = {};
</span><span class="cx"> }
</span><ins>+ const value = this._functionIndexSpaceCount++;
</ins><span class="cx"> // Collisions are fine: we'll simply count the function and forget the previous one.
</span><del>- this._functionIndexSpace[name] = this._functionIndexSpaceCount++;
</del><ins>+ this._functionIndexSpace.set(this._functionIndexSpaceKeyHash(name), value);
</ins><span class="cx"> // Map it both ways, the number space is distinct from the name space.
</span><del>- this._functionIndexSpace[this._functionIndexSpace[name]] = name;
</del><ins>+ this._functionIndexSpace.set(this._functionIndexSpaceKeyHash(value), name);
</ins><span class="cx"> }
</span><span class="cx"> _getFunctionFromIndexSpace(name) {
</span><del>- return this._functionIndexSpace[name];
</del><ins>+ return this._functionIndexSpace.get(this._functionIndexSpaceKeyHash(name));
</ins><span class="cx"> }
</span><span class="cx"> _registerSectionBuilders() {
</span><span class="cx"> for (const section in WASM.description.section) {
</span></span></pre></div>
<a id="trunkJSTestswasmjsapitest_Instancejs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/js-api/test_Instance.js (213066 => 213067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/js-api/test_Instance.js 2017-02-27 16:29:10 UTC (rev 213066)
+++ trunk/JSTests/wasm/js-api/test_Instance.js 2017-02-27 16:52:46 UTC (rev 213067)
</span><span class="lines">@@ -30,6 +30,33 @@
</span><span class="cx"> assert.eq(result, 42);
</span><span class="cx"> })();
</span><span class="cx">
</span><ins>+// FIXME exporting a property with a name that's a number doesn't work https://bugs.webkit.org/show_bug.cgi?id=168857
+/*
+(function ExportedNumber() {
+ for (let i = 0; i <= 129; ++i) {
+ const name = i.toString();
+ const builder = (new Builder())
+ .Type().End()
+ .Function().End()
+ .Export()
+ .Function(name)
+ .End()
+ .Code()
+ .Function(name, { params: [], ret: "i32" })
+ .I32Const(i)
+ .Return()
+ .End()
+ .End();
+ const bin = builder.WebAssembly().get();
+ const module = new WebAssembly.Module(bin);
+ const instance = new WebAssembly.Instance(module);
+ const result = instance.exports[name]();
+ assert.isA(result, "number");
+ assert.eq(result, i);
+ }
+})();
+*/
+
</ins><span class="cx"> const wasmModuleWhichImportJS = () => {
</span><span class="cx"> const builder = (new Builder())
</span><span class="cx"> .Type().End()
</span></span></pre></div>
<a id="trunkJSTestswasmspectestsmemorywastjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/spec-tests/memory.wast.js (213066 => 213067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/spec-tests/memory.wast.js 2017-02-27 16:29:10 UTC (rev 213066)
+++ trunk/JSTests/wasm/spec-tests/memory.wast.js 2017-02-27 16:52:46 UTC (rev 213067)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> function assert_unlinkable(bytes) {
</span><span class="cx"> let mod = module(bytes);
</span><span class="cx"> try { new WebAssembly.Instance(mod, registry) } catch (e) {
</span><del>- if (e instanceof TypeError) return;
</del><ins>+ if (e instanceof WebAssembly.LinkError) return; // Note: this is fixed in tip-of-tree wabt.
</ins><span class="cx"> }
</span><span class="cx"> throw new Error("Wasm linking failure expected");
</span><span class="cx"> }
</span><span class="lines">@@ -142,15 +142,17 @@
</span><span class="cx"> $$ = instance("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0a\x01\x08\x00\x41\x00\x2f\x01\x00\x1a\x0b");
</span><span class="cx"> $$ = instance("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0a\x01\x08\x00\x41\x00\x28\x02\x00\x1a\x0b");
</span><span class="cx"> $$ = instance("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0a\x01\x08\x00\x41\x00\x2a\x02\x00\x1a\x0b");
</span><del>-assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0a\x01\x08\x00\x41\x00\x29\x04\x00\x1a\x0b");
-assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0a\x01\x08\x00\x41\x00\x29\x05\x00\x1a\x0b");
-assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0a\x01\x08\x00\x41\x00\x28\x03\x00\x1a\x0b");
-assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0a\x01\x08\x00\x41\x00\x2f\x02\x00\x1a\x0b");
-assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0a\x01\x08\x00\x41\x00\x2d\x01\x00\x1a\x0b");
-assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0b\x01\x09\x00\x41\x00\x41\x00\x3a\x01\x00\x0b");
</del><ins>+// FIXME validate alignment. https://bugs.webkit.org/show_bug.cgi?id=168836
+//assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0a\x01\x08\x00\x41\x00\x29\x04\x00\x1a\x0b");
+//assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0a\x01\x08\x00\x41\x00\x29\x05\x00\x1a\x0b");
+//assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0a\x01\x08\x00\x41\x00\x28\x03\x00\x1a\x0b");
+//assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0a\x01\x08\x00\x41\x00\x2f\x02\x00\x1a\x0b");
+//assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0a\x01\x08\x00\x41\x00\x2d\x01\x00\x1a\x0b");
+//assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0b\x01\x09\x00\x41\x00\x41\x00\x3a\x01\x00\x0b");
</ins><span class="cx"> assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x09\x01\x07\x00\x41\x00\x2f\x02\x00\x0b");
</span><span class="cx"> assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x09\x01\x07\x00\x41\x00\x2d\x01\x00\x0b");
</span><del>-assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0b\x01\x09\x00\x41\x00\x41\x00\x3a\x01\x00\x0b");
</del><ins>+// FIXME validate alignment. https://bugs.webkit.org/show_bug.cgi?id=168836
+//assert_invalid("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x04\x01\x60\x00\x00\x03\x02\x01\x00\x05\x03\x01\x00\x00\x0a\x0b\x01\x09\x00\x41\x00\x41\x00\x3a\x01\x00\x0b");
</ins><span class="cx"> $$ = instance("\x00\x61\x73\x6d\x01\x00\x00\x00\x01\x16\x05\x60\x00\x01\x7f\x60\x00\x01\x7c\x60\x01\x7f\x01\x7f\x60\x01\x7e\x01\x7e\x60\x00\x00\x03\x1b\x1a\x00\x00\x00\x01\x02\x02\x02\x02\x03\x03\x03\x03\x03\x03\x04\x04\x04\x04\x04\x04\x04\x04\x04\x04\x04\x04\x05\x03\x01\x00\x01\x07\xbd\x02\x1a\x04\x64\x61\x74\x61\x00\x00\x07\x61\x6c\x69\x67\x6e\x65\x64\x00\x01\x09\x75\x6e\x61\x6c\x69\x67\x6e\x65\x64\x00\x02\x04\x63\x61\x73\x74\x00\x03\x0b\x69\x33\x32\x5f\x6c\x6f\x61\x64\x38\x5f\x73\x00\x04\x0b\x69\x33\x32\x5f\x6c\x6f\x61\x64\x38\x5f\x75\x00\x05\x0c\x69\x33\x32\x5f\x6c\x6f\x61\x64\x31\x36\x5f\x73\x00\x06\x0c\x69\x33\x32\x5f\x6c\x6f\x61\x64\x31\x36\x5f\x75\x00\x07\x0b\x69\x36\x34\x5f\x6c\x6f\x61\x64\x38\x5f\x73\x00\x08\x0b\x69\x36\x34\x5f\x6c\x6f\x61\x64\x38\x5f\x75\x00\x09\x0c\x69\x36\x34\x5f\x6c\x6f\x61\x64\x31\x36\x5f\x73\x00\x0a\x0c\x69\x36\x34\x5f\x6c\x6f\x61\x64\x31\x36\x5f\x75\x00\x0b\x0c\x69\x36\x34\x5f\x6c\x6f\x61\x64\x33\x32\x5f\x73\x00\x
0c\x0c\x69\x36\x34\x5f\x6c\x6f\x61\x64\x33\x32\x5f\x75\x00\x0d\x08\x61\x73\x73\x65\x72\x74\x5f\x30\x00\x0e\x08\x61\x73\x73\x65\x72\x74\x5f\x31\x00\x0f\x08\x61\x73\x73\x65\x72\x74\x5f\x32\x00\x10\x08\x61\x73\x73\x65\x72\x74\x5f\x33\x00\x11\x08\x61\x73\x73\x65\x72\x74\x5f\x34\x00\x12\x08\x61\x73\x73\x65\x72\x74\x5f\x35\x00\x13\x08\x61\x73\x73\x65\x72\x74\x5f\x36\x00\x14\x08\x61\x73\x73\x65\x72\x74\x5f\x37\x00\x15\x08\x61\x73\x73\x65\x72\x74\x5f\x38\x00\x16\x08\x61\x73\x73\x65\x72\x74\x5f\x39\x00\x17\x09\x61\x73\x73\x65\x72\x74\x5f\x31\x30\x00\x18\x09\x61\x73\x73\x65\x72\x74\x5f\x31\x31\x00\x19\x0a\x9a\x05\x1a\x4e\x00\x41\x00\x2d\x00\x00\x41\xc1\x00\x46\x41\x03\x2d\x00\x00\x41\xa7\x01\x46\x71\x41\x06\x2d\x00\x00\x41\x00\x46\x41\x13\x2d\x00\x00\x41\x00\x46\x71\x71\x41\x14\x2d\x00\x00\x41\xd7\x00\x46\x41\x17\x2d\x00\x00\x41\xcd\x00\x46\x71\x41\x18\x2d\x00\x00\x41\x00\x46\x41\xff\x07\x2d\x00\x00\x41\x00\x46\x71\x71\x71\x0b\x43\x01\x03\x7f\x41\x0a\x21\x00\x02\x40\x03\x40\x20\x00\x4
1\x00\x46\x04\x40\x0c\x02\x0b\x20\x00\x41\x04\x6c\x21\x02\x20\x02\x20\x00\x36\x02\x00\x20\x02\x28\x02\x00\x21\x01\x20\x00\x20\x01\x47\x04\x40\x41\x00\x0f\x0b\x20\x00\x41\x01\x6b\x21\x00\x0c\x00\x0b\x0b\x41\x01\x0b\x43\x02\x01\x7f\x02\x7c\x41\x0a\x21\x00\x02\x40\x03\x40\x20\x00\x41\x00\x46\x04\x40\x0c\x02\x0b\x20\x00\xb7\x21\x02\x20\x00\x20\x02\x39\x00\x00\x20\x00\x2b\x00\x00\x21\x01\x20\x02\x20\x01\x62\x04\x40\x41\x00\x0f\x0b\x20\x00\x41\x01\x6b\x21\x00\x0c\x00\x0b\x0b\x41\x01\x0b\x38\x00\x41\x08\x42\xc7\x9f\x7f\x37\x03\x00\x41\x08\x2b\x03\x00\x42\xc7\x9f\x7f\xbf\x61\x04\x40\x44\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x0b\x41\x09\x42\x00\x37\x00\x00\x41\x0f\x41\xc5\x80\x01\x3b\x00\x00\x41\x09\x2b\x00\x00\x0b\x0e\x00\x41\x08\x20\x00\x3a\x00\x00\x41\x08\x2c\x00\x00\x0b\x0e\x00\x41\x08\x20\x00\x3a\x00\x00\x41\x08\x2d\x00\x00\x0b\x0e\x00\x41\x08\x20\x00\x3b\x01\x00\x41\x08\x2e\x01\x00\x0b\x0e\x00\x41\x08\x20\x00\x3b\x01\x00\x41\x08\x2f\x01\x00\x0b\x0e\x00\x41\x08\x20\x00\x3c\x00\x00
\x41\x08\x30\x00\x00\x0b\x0e\x00\x41\x08\x20\x00\x3c\x00\x00\x41\x08\x31\x00\x00\x0b\x0e\x00\x41\x08\x20\x00\x3d\x01\x00\x41\x08\x32\x01\x00\x0b\x0e\x00\x41\x08\x20\x00\x3d\x01\x00\x41\x08\x33\x01\x00\x0b\x0e\x00\x41\x08\x20\x00\x3e\x02\x00\x41\x08\x34\x02\x00\x0b\x0e\x00\x41\x08\x20\x00\x3e\x02\x00\x41\x08\x35\x02\x00\x0b\x11\x00\x02\x40\x42\x7f\x10\x08\x42\x7f\x51\x45\x0d\x00\x0f\x0b\x00\x0b\x12\x00\x02\x40\x42\x7f\x10\x09\x42\xff\x01\x51\x45\x0d\x00\x0f\x0b\x00\x0b\x11\x00\x02\x40\x42\x7f\x10\x0a\x42\x7f\x51\x45\x0d\x00\x0f\x0b\x00\x0b\x13\x00\x02\x40\x42\x7f\x10\x0b\x42\xff\xff\x03\x51\x45\x0d\x00\x0f\x0b\x00\x0b\x11\x00\x02\x40\x42\x7f\x10\x0c\x42\x7f\x51\x45\x0d\x00\x0f\x0b\x00\x0b\x15\x00\x02\x40\x42\x7f\x10\x0d\x42\xff\xff\xff\xff\x0f\x51\x45\x0d\x00\x0f\x0b\x00\x0b\x13\x00\x02\x40\x42\xe4\x00\x10\x08\x42\xe4\x00\x51\x45\x0d\x00\x0f\x0b\x00\x0b\x13\x00\x02\x40\x42\xc8\x01\x10\x09\x42\xc8\x01\x51\x45\x0d\x00\x0f\x0b\x00\x0b\x15\x00\x02\x40\x42\xa0\x9c\x01\x10\x0a\x42\
xa0\x9c\x01\x51\x45\x0d\x00\x0f\x0b\x00\x0b\x15\x00\x02\x40\x42\xc0\xb8\x02\x10\x0b\x42\xc0\xb8\x02\x51\x45\x0d\x00\x0f\x0b\x00\x0b\x15\x00\x02\x40\x42\xa0\x9c\x01\x10\x0c\x42\xa0\x9c\x01\x51\x45\x0d\x00\x0f\x0b\x00\x0b\x15\x00\x02\x40\x42\xc0\xb8\x02\x10\x0d\x42\xc0\xb8\x02\x51\x45\x0d\x00\x0f\x0b\x00\x0b\x0b\x14\x02\x00\x41\x00\x0b\x05\x41\x42\x43\xa7\x44\x00\x41\x14\x0b\x04\x57\x41\x53\x4d");
</span><span class="cx"> assert_return(() => $$.exports["data"](), 1);
</span><span class="cx"> assert_return(() => $$.exports["aligned"](), 1);
</span></span></pre></div>
<a id="trunkJSTestswasmspectestsnameswastjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/spec-tests/names.wast.js (213066 => 213067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/spec-tests/names.wast.js 2017-02-27 16:29:10 UTC (rev 213066)
+++ trunk/JSTests/wasm/spec-tests/names.wast.js 2017-02-27 16:52:46 UTC (rev 213067)
</span><span class="lines">@@ -102,7 +102,8 @@
</span><span class="cx"> assert_return(() => $$.exports["_malloc"](), f32(6.296875));
</span><span class="cx"> assert_return(() => $$.exports["__malloc"](), f32(6.3125));
</span><span class="cx"> assert_return(() => $$.exports["~!@#$%^&*()_+`-={}|[]\x5c:\x22;'<>?,./ "](), f32(6.34375));
</span><del>-assert_return(() => $$.exports["0"](), f32(6.359375));
</del><ins>+// FIXME exporting a property with a name that's a number doesn't work https://bugs.webkit.org/show_bug.cgi?id=168857
+//assert_return(() => $$.exports["0"](), f32(6.359375));
</ins><span class="cx"> assert_return(() => $$.exports["_"](), f32(6.375));
</span><span class="cx"> assert_return(() => $$.exports["$"](), f32(6.390625));
</span><span class="cx"> assert_return(() => $$.exports["@"](), f32(8.0));
</span></span></pre></div>
<a id="trunkJSTestswasmyaml"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm.yaml (213066 => 213067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm.yaml 2017-02-27 16:29:10 UTC (rev 213066)
+++ trunk/JSTests/wasm.yaml 2017-02-27 16:52:46 UTC (rev 213067)
</span><span class="lines">@@ -133,13 +133,13 @@
</span><span class="cx"> cmd: runWebAssemblySpecTest :normal
</span><span class="cx">
</span><span class="cx"> - path: wasm/spec-tests/linking.wast.js
</span><del>- cmd: runWebAssemblySpecTest :skip
</del><ins>+ cmd: runWebAssemblySpecTest :skip # FIXME This test is mostly blocked on implementing re-exporting an import. https://bugs.webkit.org/show_bug.cgi?id=165510
</ins><span class="cx">
</span><span class="cx"> - path: wasm/spec-tests/loop.wast.js
</span><span class="cx"> cmd: runWebAssemblySpecTest :normal
</span><span class="cx">
</span><span class="cx"> - path: wasm/spec-tests/memory.wast.js
</span><del>- cmd: runWebAssemblySpecTest :skip
</del><ins>+ cmd: runWebAssemblySpecTest :normal
</ins><span class="cx">
</span><span class="cx"> - path: wasm/spec-tests/memory_redundancy.wast.js
</span><span class="cx"> cmd: runWebAssemblySpecTest :normal
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> cmd: runWebAssemblySpecTest :normal
</span><span class="cx">
</span><span class="cx"> - path: wasm/spec-tests/names.wast.js
</span><del>- cmd: runWebAssemblySpecTest :skip
</del><ins>+ cmd: runWebAssemblySpecTest :normal
</ins><span class="cx">
</span><span class="cx"> - path: wasm/spec-tests/nop.wast.js
</span><span class="cx"> cmd: runWebAssemblySpecTest :normal
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (213066 => 213067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-02-27 16:29:10 UTC (rev 213066)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-02-27 16:52:46 UTC (rev 213067)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-02-27 JF Bastien <jfbastien@apple.com>
+
+ WebAssembly: miscellaneous spec fixes part deux
+ https://bugs.webkit.org/show_bug.cgi?id=168861
+
+ Reviewed by Keith Miller.
+
+ * wasm/WasmFunctionParser.h: add some FIXME
+
</ins><span class="cx"> 2017-02-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [libwebrtc] Enable WebRTC in some Production Builds
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmFunctionParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h (213066 => 213067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h 2017-02-27 16:29:10 UTC (rev 213066)
+++ trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h 2017-02-27 16:52:46 UTC (rev 213067)
</span><span class="lines">@@ -212,6 +212,7 @@
</span><span class="cx"> ExpressionType pointer;
</span><span class="cx"> ExpressionType result;
</span><span class="cx"> WASM_PARSER_FAIL_IF(!parseVarUInt32(alignment), "can't get load alignment");
</span><ins>+ // FIXME validate alignment. https://bugs.webkit.org/show_bug.cgi?id=168836
</ins><span class="cx"> WASM_PARSER_FAIL_IF(!parseVarUInt32(offset), "can't get load offset");
</span><span class="cx"> WASM_TRY_POP_EXPRESSION_STACK_INTO(pointer, "load pointer");
</span><span class="cx"> WASM_TRY_ADD_TO_CONTEXT(load(static_cast<LoadOpType>(op), pointer, result, offset));
</span><span class="lines">@@ -225,6 +226,7 @@
</span><span class="cx"> ExpressionType value;
</span><span class="cx"> ExpressionType pointer;
</span><span class="cx"> WASM_PARSER_FAIL_IF(!parseVarUInt32(alignment), "can't get store alignment");
</span><ins>+ // FIXME validate alignment. https://bugs.webkit.org/show_bug.cgi?id=168836
</ins><span class="cx"> WASM_PARSER_FAIL_IF(!parseVarUInt32(offset), "can't get store offset");
</span><span class="cx"> WASM_TRY_POP_EXPRESSION_STACK_INTO(value, "store value");
</span><span class="cx"> WASM_TRY_POP_EXPRESSION_STACK_INTO(pointer, "store pointer");
</span></span></pre>
</div>
</div>
</body>
</html>