From 2b4d1b0fb1ebd4e8b3a92b3a9dbc1d266990de4e Mon Sep 17 00:00:00 2001
From: Svyatoslav Kuzmich <svyatoslav.kuzmich@jetbrains.com>
Date: Mon, 11 Dec 2023 16:12:54 +0100
Subject: [PATCH] [Wasm] Bump SpiderMonkey jsshell version

Experimental flags --wasm-function-references --wasm-gc are removed.
GC is enabled by default with final subtype support.
---
 gradle/verification-metadata.xml              | 20 +++++++++----------
 wasm/wasm.tests/build.gradle.kts              |  4 ++--
 .../kotlin/wasm/test/tools/WasmVM.kt          |  2 --
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 6afaffaee98..403bf7cd817 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -4558,18 +4558,18 @@
             <sha256 value="56df2cd46e45e8e8069fcc89bfcde1767cbbb6430d0e60ecbd13404a4e967963" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.mozilla" name="jsshell" version="2023-09-20-09-21-12-mozilla-central">
-         <artifact name="jsshell-2023-09-20-09-21-12-mozilla-central-linux-x86_64.zip">
-            <md5 value="6e927c59ab879e406c1e4c56abbb3f14" origin="Generated by Gradle"/>
-            <sha256 value="8af5cb1789aab3c9ca7d52d0725a565cc1f96ecf6981b1dd2cb1cac57bbaf06b" origin="Generated by Gradle"/>
+      <component group="org.mozilla" name="jsshell" version="2023-12-08-21-57-22-mozilla-central">
+         <artifact name="jsshell-2023-12-08-21-57-22-mozilla-central-linux-x86_64.zip">
+            <md5 value="151c9f38b3db029ed6d58995a836aa96" origin="Generated by Gradle"/>
+            <sha256 value="82466f1d8a4435c374659457d207930da92086184b02cbddf142f5c23aaec488" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="jsshell-2023-09-20-09-21-12-mozilla-central-mac.zip">
-            <md5 value="d31ea9576986f8050ce57abfd77f474c" origin="Generated by Gradle"/>
-            <sha256 value="bc1d471c76d2e79e54709d1ae329c2a93a1b51de9fa4fe5c0e662656ccdcb7e0" origin="Generated by Gradle"/>
+         <artifact name="jsshell-2023-12-08-21-57-22-mozilla-central-mac.zip">
+            <md5 value="d66e9a36eee00c40a9ddfa8ecf1c7cfe" origin="Generated by Gradle"/>
+            <sha256 value="54550140f1046773a1b10d14f7bed3976f9e5c5f672f7ae92e4e7e83788bff03" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="jsshell-2023-09-20-09-21-12-mozilla-central-win64.zip">
-            <md5 value="1a54817a547c3412ff191779f48e6987" origin="Generated by Gradle"/>
-            <sha256 value="fbe1036ea8fbb8b45751a283ceabac48d0343e12e3bf98d75f9b13bf037a8504" origin="Generated by Gradle"/>
+         <artifact name="jsshell-2023-12-08-21-57-22-mozilla-central-win64.zip">
+            <md5 value="c18206096f686164250f75510cb90509" origin="Generated by Gradle"/>
+            <sha256 value="ff0ab6f416a8c79ad31ce4c0b8a0b21a0ad8b50c6c25c56a9627f9c7ddbcce12" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.nodejs" name="node" version="20.2.0">
diff --git a/wasm/wasm.tests/build.gradle.kts b/wasm/wasm.tests/build.gradle.kts
index c7e9e2e4c2a..0f7b3f440a8 100644
--- a/wasm/wasm.tests/build.gradle.kts
+++ b/wasm/wasm.tests/build.gradle.kts
@@ -11,7 +11,7 @@ repositories {
     ivy {
         url = URI("https://archive.mozilla.org/pub/firefox/nightly/")
         patternLayout {
-            artifact("2023/09/[revision]/[artifact]-[classifier].[ext]")
+            artifact("2023/12/[revision]/[artifact]-[classifier].[ext]")
         }
         metadataSources { artifact() }
         content { includeModule("org.mozilla", "jsshell") }
@@ -44,7 +44,7 @@ val currentOsType = run {
 }
 
 
-val jsShellVersion = "2023-09-20-09-21-12-mozilla-central"
+val jsShellVersion = "2023-12-08-21-57-22-mozilla-central"
 val jsShellSuffix = when (currentOsType) {
     OsType(OsName.LINUX, OsArch.X86_32) -> "linux-i686"
     OsType(OsName.LINUX, OsArch.X86_64) -> "linux-x86_64"
diff --git a/wasm/wasm.tests/test/org/jetbrains/kotlin/wasm/test/tools/WasmVM.kt b/wasm/wasm.tests/test/org/jetbrains/kotlin/wasm/test/tools/WasmVM.kt
index ad4b8d5d161..cf3168ab9e5 100644
--- a/wasm/wasm.tests/test/org/jetbrains/kotlin/wasm/test/tools/WasmVM.kt
+++ b/wasm/wasm.tests/test/org/jetbrains/kotlin/wasm/test/tools/WasmVM.kt
@@ -53,9 +53,7 @@ internal sealed class WasmVM(val shortName: String) {
             tool.run(
                 *toolArgs.toTypedArray(),
                 "--wasm-verbose",
-                "--wasm-gc",
                 *if (disableExceptionHandlingIfPossible) arrayOf("--no-wasm-exceptions") else emptyArray(),
-                "--wasm-function-references",
                 *jsFiles.flatMap { listOf("-f", it) }.toTypedArray(),
                 "--module=$entryMjs",
                 workingDirectory = workingDirectory,