Title: [210407] branches/safari-603-branch
- Revision
- 210407
- Author
- [email protected]
- Date
- 2017-01-05 17:48:03 -0800 (Thu, 05 Jan 2017)
Log Message
Merge r210091. rdar://problem/29782833
Modified Paths
Diff
Modified: branches/safari-603-branch/JSTests/ChangeLog (210406 => 210407)
--- branches/safari-603-branch/JSTests/ChangeLog 2017-01-06 01:47:59 UTC (rev 210406)
+++ branches/safari-603-branch/JSTests/ChangeLog 2017-01-06 01:48:03 UTC (rev 210407)
@@ -1,5 +1,18 @@
2017-01-05 Matthew Hanson <[email protected]>
+ Merge r210091. rdar://problem/29782833
+
+ 2016-12-21 Keith Miller <[email protected]>
+
+ WebAssembly: Fix decode floating point constants in unreachable code
+ https://bugs.webkit.org/show_bug.cgi?id=166400
+
+ Reviewed by Saam Barati.
+
+ * wasm.yaml:
+
+2017-01-05 Matthew Hanson <[email protected]>
+
Merge r210090. rdar://problem/29782821
2016-12-21 Keith Miller <[email protected]>
Modified: branches/safari-603-branch/JSTests/wasm.yaml (210406 => 210407)
--- branches/safari-603-branch/JSTests/wasm.yaml 2017-01-06 01:47:59 UTC (rev 210406)
+++ branches/safari-603-branch/JSTests/wasm.yaml 2017-01-06 01:48:03 UTC (rev 210407)
@@ -38,13 +38,13 @@
cmd: runWebAssemblySpecTest :skip
- path: wasm/spec-tests/br.wast.js
- cmd: runWebAssemblySpecTest :skip
+ cmd: runWebAssemblySpecTest :normal
- path: wasm/spec-tests/br_if.wast.js
cmd: runWebAssemblySpecTest :skip
- path: wasm/spec-tests/br_table.wast.js
- cmd: runWebAssemblySpecTest :skip
+ cmd: runWebAssemblySpecTest :normal
- path: wasm/spec-tests/break-drop.wast.js
cmd: runWebAssemblySpecTest :normal
@@ -155,7 +155,7 @@
cmd: runWebAssemblySpecTest :skip
- path: wasm/spec-tests/return.wast.js
- cmd: runWebAssemblySpecTest :skip
+ cmd: runWebAssemblySpecTest :normal
- path: wasm/spec-tests/select.wast.js
cmd: runWebAssemblySpecTest :skip
Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (210406 => 210407)
--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-01-06 01:47:59 UTC (rev 210406)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-01-06 01:48:03 UTC (rev 210407)
@@ -1,5 +1,20 @@
2017-01-05 Matthew Hanson <[email protected]>
+ Merge r210091. rdar://problem/29782833
+
+ 2016-12-21 Keith Miller <[email protected]>
+
+ WebAssembly: Fix decode floating point constants in unreachable code
+ https://bugs.webkit.org/show_bug.cgi?id=166400
+
+ Reviewed by Saam Barati.
+
+ We decoded these as variable length but they should be fixed length.
+
+ * wasm/WasmFunctionParser.h:
+
+2017-01-05 Matthew Hanson <[email protected]>
+
Merge r210090. rdar://problem/29782821
2016-12-21 Keith Miller <[email protected]>
Modified: branches/safari-603-branch/Source/_javascript_Core/wasm/WasmFunctionParser.h (210406 => 210407)
--- branches/safari-603-branch/Source/_javascript_Core/wasm/WasmFunctionParser.h 2017-01-06 01:47:59 UTC (rev 210406)
+++ branches/safari-603-branch/Source/_javascript_Core/wasm/WasmFunctionParser.h 2017-01-06 01:48:03 UTC (rev 210407)
@@ -547,6 +547,18 @@
return { };
}
+ case F32Const: {
+ uint32_t unused;
+ WASM_PARSER_FAIL_IF(!parseUInt32(unused), "can't parse 32-bit floating-point constant");
+ return { };
+ }
+
+ case F64Const: {
+ uint64_t constant;
+ WASM_PARSER_FAIL_IF(!parseUInt64(constant), "can't parse 64-bit floating-point constant");
+ return { };
+ }
+
// two immediate cases
FOR_EACH_WASM_MEMORY_LOAD_OP(CREATE_CASE)
FOR_EACH_WASM_MEMORY_STORE_OP(CREATE_CASE) {
@@ -557,9 +569,7 @@
}
// one immediate cases
- case F32Const:
case I32Const:
- case F64Const:
case I64Const:
case SetLocal:
case GetLocal:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
