Attachment 373288 Details for Bug 199390 – Patch

[patch] Patch

bug-199390-20190701173722.patch (text/plain), 12.17 KB, created by Justin Michaud on 2019-07-01 17:37:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Justin Michaud

Created: 2019-07-01 17:37:22 PDT

Size: 12.17 KB

patch

obsolete

>Subversion Revision: 247030
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index d1fb074c25bf86ac08a77507dddf63aff10a1b69..c9e59c4964b25c75cafe07c070a53ea4f1c6249a 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-07-01  Justin Michaud  <justin_michaud@apple.com>
>+
>+        [Wasm-References] Disable references by default
>+        https://bugs.webkit.org/show_bug.cgi?id=199390
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * runtime/Options.h:
>+
> 2019-07-01  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r246946.
>diff --git a/Source/JavaScriptCore/runtime/Options.h b/Source/JavaScriptCore/runtime/Options.h
>index c42a341fd8ddbb14fb3e6277562a45aa3d06da04..cf96aa9f6c13856b5fe9c4abc91e39e7526ea831 100644
>--- a/Source/JavaScriptCore/runtime/Options.h
>+++ b/Source/JavaScriptCore/runtime/Options.h
>@@ -502,7 +502,7 @@ constexpr bool enableWebAssemblyStreamingApi = false;
>     v(bool, useWebAssemblyStreamingApi, enableWebAssemblyStreamingApi, Normal, "Allow to run WebAssembly's Streaming API") \
>     v(bool, useCallICsForWebAssemblyToJSCalls, true, Normal, "If true, we will use CallLinkInfo to inline cache Wasm to JS calls.") \
>     v(bool, useEagerWebAssemblyModuleHashing, false, Normal, "Unnamed WebAssembly modules are identified in backtraces through their hash, if available.") \
>-    v(bool, useWebAssemblyReferences, true, Normal, "Allow types from the wasm references spec.") \
>+    v(bool, useWebAssemblyReferences, false, Normal, "Allow types from the wasm references spec.") \
>     v(bool, useBigInt, false, Normal, "If true, we will enable BigInt support.") \
>     v(bool, useIntlNumberFormatToParts, enableIntlNumberFormatToParts, Normal, "If true, we will enable Intl.NumberFormat.prototype.formatToParts") \
>     v(bool, useIntlPluralRules, enableIntlPluralRules, Normal, "If true, we will enable Intl.PluralRules.") \
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 54929459bab8d23208efb4666e627e62f2e0de08..11c23fc9ed7f4eb879233c21a7f04996d3a5cf8c 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-07-01  Justin Michaud  <justin_michaud@apple.com>
>+
>+        [Wasm-References] Disable references by default
>+        https://bugs.webkit.org/show_bug.cgi?id=199390
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/run-jsc-stress-tests:
>+
> 2019-07-01  Alex Christensen  <achristensen@webkit.org>
> 
>         Add new decidePolicyForNavigationAction SPI with preferences and userInfo
>diff --git a/Tools/Scripts/run-jsc-stress-tests b/Tools/Scripts/run-jsc-stress-tests
>index a0336567976fe449cb894a8b21b0a6fcba321e40..eea17fbfc199c1b614f4b6c73092665688d02d65 100755
>--- a/Tools/Scripts/run-jsc-stress-tests
>+++ b/Tools/Scripts/run-jsc-stress-tests
>@@ -1090,21 +1090,21 @@ def runWebAssembly
>     end
> end
> 
>-def runWebAssemblySuite
>+def runWebAssemblySuite(*optionalTestSpecificOptions)
>     return if !$jitTests
>     return if !$isFTLPlatform
>     modules = Dir[WASMTESTS_PATH + "*.js"].map { |f| File.basename(f) }
>     prepareExtraAbsoluteFiles(WASMTESTS_PATH, ["wasm.json"])
>     prepareExtraRelativeFiles(modules.map { |f| "../" + f }, $collection)
>-    run("default-wasm", "-m", *FTL_OPTIONS)
>+    run("default-wasm", "-m", *(FTL_OPTIONS + optionalTestSpecificOptions))
>     if $mode != "quick"
>-        run("wasm-no-cjit-yes-tls-context", "-m", "--useFastTLSForWasmContext=true", *(FTL_OPTIONS + NO_CJIT_OPTIONS))
>-        run("wasm-eager-jettison", "-m", "--forceCodeBlockToJettisonDueToOldAge=true", *FTL_OPTIONS)
>-        run("wasm-no-call-ic", "-m", "--useCallICsForWebAssemblyToJSCalls=false", *FTL_OPTIONS)
>-        run("wasm-no-tls-context", "-m", "--useFastTLSForWasmContext=false", *FTL_OPTIONS)
>-        run("wasm-slow-memory", "-m", "--useWebAssemblyFastMemory=false", *FTL_OPTIONS)
>-        run("wasm-no-air", "-m", "--wasmBBQUsesAir=false", *FTL_OPTIONS)
>-        run("wasm-collect-continuously", "-m", "--collectContinuously=true", *FTL_OPTIONS) if shouldCollectContinuously?
>+        run("wasm-no-cjit-yes-tls-context", "-m", "--useFastTLSForWasmContext=true", *(FTL_OPTIONS + NO_CJIT_OPTIONS + optionalTestSpecificOptions))
>+        run("wasm-eager-jettison", "-m", "--forceCodeBlockToJettisonDueToOldAge=true", *(FTL_OPTIONS + optionalTestSpecificOptions))
>+        run("wasm-no-call-ic", "-m", "--useCallICsForWebAssemblyToJSCalls=false", *(FTL_OPTIONS + optionalTestSpecificOptions))
>+        run("wasm-no-tls-context", "-m", "--useFastTLSForWasmContext=false", *(FTL_OPTIONS + optionalTestSpecificOptions))
>+        run("wasm-slow-memory", "-m", "--useWebAssemblyFastMemory=false", *(FTL_OPTIONS + optionalTestSpecificOptions))
>+        run("wasm-no-air", "-m", "--wasmBBQUsesAir=false", *(FTL_OPTIONS + optionalTestSpecificOptions))
>+        run("wasm-collect-continuously", "-m", "--collectContinuously=true", *(FTL_OPTIONS + optionalTestSpecificOptions)) if shouldCollectContinuously?
>     end
> end
> 
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 5f75eda5a09cb27821e8674831a2d8eb96dc9788..6e922269b33bcd0dee6fd480053f8ee517db4a83 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-07-01  Justin Michaud  <justin_michaud@apple.com>
>+
>+        [Wasm-References] Disable references by default
>+        https://bugs.webkit.org/show_bug.cgi?id=199390
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * workers/wasm-references.html:
>+
> 2019-07-01  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS 13] editing/selection/ios/dispatch-mouse-events-when-modifying-selection-quirk.html fails on trunk
>diff --git a/LayoutTests/workers/wasm-references.html b/LayoutTests/workers/wasm-references.html
>index 348241b879b5597f9d005db62308b7280c68b574..5c2abf114a0cae5517be307a8b2d14e3a2422e13 100644
>--- a/LayoutTests/workers/wasm-references.html
>+++ b/LayoutTests/workers/wasm-references.html
>@@ -1,3 +1,4 @@
>+
> <html>
> <head>
> <script src="../resources/js-test-pre.js"></script>
>diff --git a/JSTests/ChangeLog b/JSTests/ChangeLog
>index c0126b36563c4d61c0175c6d092e03d90df0bcfc..e77344a4c1949cad5415f0d3c5d2bbea63cf3280 100644
>--- a/JSTests/ChangeLog
>+++ b/JSTests/ChangeLog
>@@ -1,3 +1,23 @@
>+2019-07-01  Justin Michaud  <justin_michaud@apple.com>
>+
>+        [Wasm-References] Disable references by default
>+        https://bugs.webkit.org/show_bug.cgi?id=199390
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wasm/references-spec-tests/ref_is_null.js:
>+        * wasm/references-spec-tests/ref_null.js:
>+        * wasm/references/anyref_globals.js:
>+        * wasm/references/anyref_modules.js:
>+        * wasm/references/anyref_table.js:
>+        * wasm/references/anyref_table_import.js:
>+        * wasm/references/element_parsing.js:
>+        * wasm/references/func_ref.js:
>+        * wasm/references/is_null.js:
>+        * wasm/references/multitable.js:
>+        * wasm/references/table_misc.js:
>+        * wasm/references/validation.js:
>+
> 2019-07-01  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r246946.
>diff --git a/JSTests/wasm/references-spec-tests/ref_is_null.js b/JSTests/wasm/references-spec-tests/ref_is_null.js
>index 83ab049faf5d76d0b965810c42beaf2005ded6fa..ab9f64c8c0408c188f1f54ea73f8bdad7278ba98 100644
>--- a/JSTests/wasm/references-spec-tests/ref_is_null.js
>+++ b/JSTests/wasm/references-spec-tests/ref_is_null.js
>@@ -1,4 +1,4 @@
>-
>+//@ runWebAssemblySuite("--useWebAssemblyReferences=true")
> 'use strict';
> let console = { log: print }
> let hostrefs = {};
>diff --git a/JSTests/wasm/references-spec-tests/ref_null.js b/JSTests/wasm/references-spec-tests/ref_null.js
>index d02590436592c9c8dc6bc152f7c58f15f538a788..1cf8da0a510951373a715c6233d453d20d7aca07 100644
>--- a/JSTests/wasm/references-spec-tests/ref_null.js
>+++ b/JSTests/wasm/references-spec-tests/ref_null.js
>@@ -1,3 +1,4 @@
>+//@ runWebAssemblySuite("--useWebAssemblyReferences=true")
> 'use strict';
> 
> let console = { log: print }
>diff --git a/JSTests/wasm/references/anyref_globals.js b/JSTests/wasm/references/anyref_globals.js
>index 2d3ca7bc605f7974cfef25814e89ae584b053130..61e27d19a8a67d47edb90b0a02520f544e954426 100644
>--- a/JSTests/wasm/references/anyref_globals.js
>+++ b/JSTests/wasm/references/anyref_globals.js
>@@ -1,3 +1,4 @@
>+//@ runWebAssemblySuite("--useWebAssemblyReferences=true")
> import * as assert from '../assert.js';
> import Builder from '../Builder.js';
> 
>diff --git a/JSTests/wasm/references/anyref_modules.js b/JSTests/wasm/references/anyref_modules.js
>index ed10096d7b5ce6a1c6ea98653c58fd2504223fc3..38c1734cef918e2bab86afd606934fdbf35a8663 100644
>--- a/JSTests/wasm/references/anyref_modules.js
>+++ b/JSTests/wasm/references/anyref_modules.js
>@@ -1,3 +1,4 @@
>+//@ runWebAssemblySuite("--useWebAssemblyReferences=true")
> import * as assert from '../assert.js';
> import Builder from '../Builder.js';
> 
>diff --git a/JSTests/wasm/references/anyref_table.js b/JSTests/wasm/references/anyref_table.js
>index f3dd01be1ec001fa3a5029c8bc5cf9286443cc60..c8beaee8112458b0ad996ff521e869f84abbbf76 100644
>--- a/JSTests/wasm/references/anyref_table.js
>+++ b/JSTests/wasm/references/anyref_table.js
>@@ -1,3 +1,4 @@
>+//@ runWebAssemblySuite("--useWebAssemblyReferences=true")
> import * as assert from '../assert.js';
> import Builder from '../Builder.js';
> 
>diff --git a/JSTests/wasm/references/anyref_table_import.js b/JSTests/wasm/references/anyref_table_import.js
>index 2fc601eaf4024c9bf85b00d723f1dd46345193b7..62f3a046aaa99bd030bc572a4bf752eebd831e79 100644
>--- a/JSTests/wasm/references/anyref_table_import.js
>+++ b/JSTests/wasm/references/anyref_table_import.js
>@@ -1,3 +1,4 @@
>+//@ runWebAssemblySuite("--useWebAssemblyReferences=true")
> import * as assert from '../assert.js';
> import Builder from '../Builder.js';
> 
>diff --git a/JSTests/wasm/references/element_parsing.js b/JSTests/wasm/references/element_parsing.js
>index bc27eac6c31099f6002edbb93e709bb4491a3722..93be1fd65762d4455aae935d32e7c6d36408ca01 100644
>--- a/JSTests/wasm/references/element_parsing.js
>+++ b/JSTests/wasm/references/element_parsing.js
>@@ -1,3 +1,4 @@
>+//@ runWebAssemblySuite("--useWebAssemblyReferences=true")
> import * as assert from '../assert.js';
> 
> function module(bytes, valid = true) {
>diff --git a/JSTests/wasm/references/func_ref.js b/JSTests/wasm/references/func_ref.js
>index ee5187ef3e6aefced6fd930a96298195e0046f7d..9265e630b6de3f5c5f6aceddf5aba9f53f9c5d5c 100644
>--- a/JSTests/wasm/references/func_ref.js
>+++ b/JSTests/wasm/references/func_ref.js
>@@ -1,3 +1,4 @@
>+//@ runWebAssemblySuite("--useWebAssemblyReferences=true")
> import * as assert from '../assert.js';
> import Builder from '../Builder.js';
> 
>diff --git a/JSTests/wasm/references/is_null.js b/JSTests/wasm/references/is_null.js
>index 1c7bc578fa94926856871e82722d7bd680d3a6b9..6358f45fcf0f119b9f67a45167b8abc9beb697a5 100644
>--- a/JSTests/wasm/references/is_null.js
>+++ b/JSTests/wasm/references/is_null.js
>@@ -1,3 +1,4 @@
>+//@ runWebAssemblySuite("--useWebAssemblyReferences=true")
> import * as assert from '../assert.js';
> import Builder from '../Builder.js';
> 
>diff --git a/JSTests/wasm/references/multitable.js b/JSTests/wasm/references/multitable.js
>index 784ea5d71313095cff2c45941ae2d516d611ff2b..7ef7130d1ccbecef72ea043efa244bfabc0ed2aa 100644
>--- a/JSTests/wasm/references/multitable.js
>+++ b/JSTests/wasm/references/multitable.js
>@@ -1,3 +1,4 @@
>+//@ runWebAssemblySuite("--useWebAssemblyReferences=true")
> import * as assert from '../assert.js';
> import Builder from '../Builder.js';
> 
>diff --git a/JSTests/wasm/references/table_misc.js b/JSTests/wasm/references/table_misc.js
>index 964c62b54199c268d18ef3ae1f0cb963c8273254..5c65716ebd2c93a9dd21b5786c85dc774ecfccb8 100644
>--- a/JSTests/wasm/references/table_misc.js
>+++ b/JSTests/wasm/references/table_misc.js
>@@ -1,3 +1,4 @@
>+//@ runWebAssemblySuite("--useWebAssemblyReferences=true")
> import * as assert from '../assert.js';
> import Builder from '../Builder.js';
> 
>diff --git a/JSTests/wasm/references/validation.js b/JSTests/wasm/references/validation.js
>index a288c8b4998cbe42ee4ec9def6792ae8c90de449..19bddf99e2b7eee900e5d66801afc967bb0d7b84 100644
>--- a/JSTests/wasm/references/validation.js
>+++ b/JSTests/wasm/references/validation.js
>@@ -1,3 +1,4 @@
>+//@ runWebAssemblySuite("--useWebAssemblyReferences=true")
> import * as assert from '../assert.js';
> import Builder from '../Builder.js';
>

Actions: View | Formatted Diff | Diff

Attachments on bug 199390: 373288