Title: [210389] branches/safari-603-branch/JSTests
- Revision
- 210389
- Author
- matthew_han...@apple.com
- Date
- 2017-01-05 15:49:33 -0800 (Thu, 05 Jan 2017)
Log Message
Merge r210312. rdar://problem/29876342
Modified Paths
Diff
Modified: branches/safari-603-branch/JSTests/ChangeLog (210388 => 210389)
--- branches/safari-603-branch/JSTests/ChangeLog 2017-01-05 23:49:31 UTC (rev 210388)
+++ branches/safari-603-branch/JSTests/ChangeLog 2017-01-05 23:49:33 UTC (rev 210389)
@@ -1,5 +1,19 @@
2017-01-05 Matthew Hanson <matthew_han...@apple.com>
+ Merge r210312. rdar://problem/29876342
+
+ 2017-01-04 JF Bastien <jfbast...@apple.com>
+
+ WebAssembly: sections with the same name are allowed
+ https://bugs.webkit.org/show_bug.cgi?id=166708
+
+ Reviewed by Saam Barati.
+
+ * wasm/self-test/test_BuilderJSON.js:
+ (SectionsWithSameCustomName):
+
+2017-01-05 Matthew Hanson <matthew_han...@apple.com>
+
Merge r210028. rdar://problem/29747874
2016-12-20 JF Bastien <jfbast...@apple.com>
Modified: branches/safari-603-branch/JSTests/wasm/self-test/test_BuilderJSON.js (210388 => 210389)
--- branches/safari-603-branch/JSTests/wasm/self-test/test_BuilderJSON.js 2017-01-05 23:49:31 UTC (rev 210388)
+++ branches/safari-603-branch/JSTests/wasm/self-test/test_BuilderJSON.js 2017-01-05 23:49:33 UTC (rev 210389)
@@ -80,8 +80,15 @@
})();
(function SectionsWithSameCustomName() {
- const b = (new Builder()).Unknown("foo").End();
- assert.throws(() => b.Unknown("foo"), Error, `Expected falsy: Cannot have two sections with the same name "foo" and ID 0`);
+ const b = (new Builder()).Unknown("foo").Byte(42).End().Unknown("foo").Byte(100).End();
+ const j = JSON.parse(b.json());
+ assert.eq(j.section.length, 2);
+ assert.eq(j.section[0].name, "foo");
+ assert.eq(j.section[0].data.length, 1);
+ assert.eq(j.section[0].data[0], 42);
+ assert.eq(j.section[1].name, "foo");
+ assert.eq(j.section[1].data.length, 1);
+ assert.eq(j.section[1].data[0], 100);
})();
(function EmptyTypeSection() {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
