Changeset 209863 in webkit

Timestamp:

Dec 15, 2016 8:53:38 AM (7 years ago)

Author:

keith_miller@apple.com

Message:

WebAssembly: test_BuilderJSON.js is broken
​https://bugs.webkit.org/show_bug.cgi?id=165893

Reviewed by Michael Saboff.

• wasm/Builder.js:

(const._isValidValue):

• wasm/self-test/test_BuilderJSON.js:

Location:

trunk/JSTests

Files:

• ChangeLog (modified) (1 diff)
• wasm/Builder.js (modified) (3 diffs)
• wasm/self-test/test_BuilderJSON.js (modified) (2 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2016-12-14  Keith Miller  <keith_miller@apple.com>
+
+        WebAssembly: test_BuilderJSON.js is broken
+        https://bugs.webkit.org/show_bug.cgi?id=165893
+
+        Reviewed by Michael Saboff.
+
+        * wasm/Builder.js:
+        (const._isValidValue):
+        * wasm/self-test/test_BuilderJSON.js:
+
 2016-12-14  Keith Miller  <keith_miller@apple.com>
 

trunk/JSTests/wasm/Builder.js

@@ -26 +26 @@
 import * as assert from 'assert.js';
 import * as BuildWebAssembly from 'Builder_WebAssemblyBinary.js';
+import * as LLB from 'LowLevelBinary.js';
 import * as WASM from 'WASM.js';
 
@@ -37 +38 @@
     switch (type) {
     // We allow both signed and unsigned numbers.
-    case "i32": return -(2 ** 31) <= value && value < 2 ** 32;
+    case "i32": return Math.round(value) === value && LLB.varint32Min <= value && value <= LLB.varuint32Max;
     case "i64": throw new Error(`Unimplemented: value check for ${type}`); // FIXME https://bugs.webkit.org/show_bug.cgi?id=163420 64-bit values
     case "f32": return typeof(value) === "number" && isFinite(value);
@@ -280 +281 @@
         switch (expect.name) {
         case "function_index":
-            assert.truthy(_isValidValue(got, "i32"), `Invalid value on ${op}: got "${got}", expected i32`);
+            assert.truthy(_isValidValue(got, "i32") && got >= 0, `Invalid value on ${op}: got "${got}", expected non-negative i32`);
             // FIXME check function indices. https://bugs.webkit.org/show_bug.cgi?id=163421
             break;

trunk/JSTests/wasm/self-test/test_BuilderJSON.js

@@ -483 +483 @@
 (function CallInvalid() {
     for (let c of [-1, 0x100000000, "0", {}, Infinity, -Infinity, NaN, -NaN, null])
-        assertOpThrows(f => f.Call(c), `Expected truthy: Invalid value on call: got "${c}", expected i32`);
+        assertOpThrows(f => f.Call(c), `Expected truthy: Invalid value on call: got "${c}", expected non-negative i32`);
 })();
 
 (function I32ConstValid() {
-    for (let c of [0, 1, 2, 42, 1337, 0xFF, 0xFFFF, 0x7FFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF]) {
+    for (let c of [-100, -1, 0, 1, 2, 42, 1337, 0xFF, 0xFFFF, 0x7FFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF]) {
         const b = (new Builder()).Type().End().Code().Function().I32Const(c).Return().End().End();
         const j = JSON.parse(b.json());
@@ -498 +498 @@
 
 (function I32ConstInvalid() {
-    for (let c of [-1, 0x100000000, 0.1, -0.1, "0", {}, Infinity, null])
+    for (let c of [0x100000000, 0.1, -0.1, "0", {}, Infinity, null])
         assertOpThrows(f => f.I32Const(c), `Expected truthy: Invalid value on i32.const: got "${c}", expected i32`);
 })();