From e130b58895b64a0fe3a088e25f4043a12f3634ca Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Tue, 9 Feb 2021 15:31:25 -0800
Subject: Simplify asmConst handling. NFC. (#3558)

Support for multiple signatures per JS code string was removed in #2422.

emscripten now only needs to know that address and the body of the JS
function.

See https://github.com/emscripten-core/emscripten/pull/13452.
---
 test/lit/wasm-emscripten-finalize/passive-pic.wat | 2 +-
 test/lld/em_asm.wat.mem.out                       | 6 +++---
 test/lld/em_asm.wat.out                           | 6 +++---
 test/lld/em_asm64.wat.out                         | 6 +++---
 test/lld/em_asm_O0.wat.out                        | 6 +++---
 test/lld/em_asm_main_thread.wat.out               | 6 +++---
 test/lld/em_asm_shared.wat.out                    | 6 +++---
 7 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'test')

diff --git a/test/lit/wasm-emscripten-finalize/passive-pic.wat b/test/lit/wasm-emscripten-finalize/passive-pic.wat
index e9af5b1d9..14e6842a3 100644
--- a/test/lit/wasm-emscripten-finalize/passive-pic.wat
+++ b/test/lit/wasm-emscripten-finalize/passive-pic.wat
@@ -4,7 +4,7 @@
 ;; RUN: wasm-emscripten-finalize --enable-bulk-memory %s -o out.wasm | filecheck %s
 
 ;; CHECK:  "asmConsts": {
-;; CHECK:    "3": ["hello", ["iii"], [""]]
+;; CHECK:    "3": "hello"
 ;; CHECK:  },
 
 (module
diff --git a/test/lld/em_asm.wat.mem.out b/test/lld/em_asm.wat.mem.out
index 8a24bb270..ca85963ad 100644
--- a/test/lld/em_asm.wat.mem.out
+++ b/test/lld/em_asm.wat.mem.out
@@ -68,9 +68,9 @@
 --BEGIN METADATA --
 {
   "asmConsts": {
-    "568": ["{ Module.print(\"Hello world\"); }", ["iii"], [""]],
-    "602": ["{ return $0 + $1; }", ["iii"], [""]],
-    "625": ["{ Module.print(\"Got \" + $0); }", ["iii"], [""]]
+    "568": "{ Module.print(\"Hello world\"); }",
+    "602": "{ return $0 + $1; }",
+    "625": "{ Module.print(\"Got \" + $0); }"
   },
   "tableSize": 1,
   "declares": [
diff --git a/test/lld/em_asm.wat.out b/test/lld/em_asm.wat.out
index f7655985c..487f51c14 100644
--- a/test/lld/em_asm.wat.out
+++ b/test/lld/em_asm.wat.out
@@ -69,9 +69,9 @@
 --BEGIN METADATA --
 {
   "asmConsts": {
-    "568": ["{ Module.print(\"Hello world\"); }", ["iii"], [""]],
-    "602": ["{ return $0 + $1; }", ["iii"], [""]],
-    "625": ["{ Module.print(\"Got \" + $0); }", ["iii"], [""]]
+    "568": "{ Module.print(\"Hello world\"); }",
+    "602": "{ return $0 + $1; }",
+    "625": "{ Module.print(\"Got \" + $0); }"
   },
   "tableSize": 1,
   "declares": [
diff --git a/test/lld/em_asm64.wat.out b/test/lld/em_asm64.wat.out
index 35425a600..13a279cd4 100644
--- a/test/lld/em_asm64.wat.out
+++ b/test/lld/em_asm64.wat.out
@@ -69,9 +69,9 @@
 --BEGIN METADATA --
 {
   "asmConsts": {
-    "568": ["{ Module.print(\"Hello world\"); }", ["ijj"], [""]],
-    "602": ["{ return $0 + $1; }", ["ijj"], [""]],
-    "625": ["{ Module.print(\"Got \" + $0); }", ["ijj"], [""]]
+    "568": "{ Module.print(\"Hello world\"); }",
+    "602": "{ return $0 + $1; }",
+    "625": "{ Module.print(\"Got \" + $0); }"
   },
   "tableSize": 1,
   "declares": [
diff --git a/test/lld/em_asm_O0.wat.out b/test/lld/em_asm_O0.wat.out
index 48c9158bc..be664978c 100644
--- a/test/lld/em_asm_O0.wat.out
+++ b/test/lld/em_asm_O0.wat.out
@@ -94,9 +94,9 @@
 --BEGIN METADATA --
 {
   "asmConsts": {
-    "568": ["{ Module.print(\"Hello world\"); }", ["iii"], [""]],
-    "601": ["{ return $0 + $1; }", ["iii"], [""]],
-    "621": ["{ Module.print(\"Got \" + $0); }", ["iii"], [""]]
+    "568": "{ Module.print(\"Hello world\"); }",
+    "601": "{ return $0 + $1; }",
+    "621": "{ Module.print(\"Got \" + $0); }"
   },
   "tableSize": 1,
   "declares": [
diff --git a/test/lld/em_asm_main_thread.wat.out b/test/lld/em_asm_main_thread.wat.out
index 55e992a22..9609cef56 100644
--- a/test/lld/em_asm_main_thread.wat.out
+++ b/test/lld/em_asm_main_thread.wat.out
@@ -194,9 +194,9 @@
 --BEGIN METADATA --
 {
   "asmConsts": {
-    "568": ["{ Module.print(\"Hello world\"); }", ["iii"], ["sync_on_main_thread_"]],
-    "601": ["{ return $0 + $1; }", ["iii"], ["sync_on_main_thread_"]],
-    "621": ["{ Module.print(\"Got \" + $0); }", ["iii"], ["sync_on_main_thread_"]]
+    "568": "{ Module.print(\"Hello world\"); }",
+    "601": "{ return $0 + $1; }",
+    "621": "{ Module.print(\"Got \" + $0); }"
   },
   "tableSize": 1,
   "declares": [
diff --git a/test/lld/em_asm_shared.wat.out b/test/lld/em_asm_shared.wat.out
index c9872a503..fd143a016 100644
--- a/test/lld/em_asm_shared.wat.out
+++ b/test/lld/em_asm_shared.wat.out
@@ -95,9 +95,9 @@
 --BEGIN METADATA --
 {
   "asmConsts": {
-    "0": ["{ Module.print(\"Hello world\"); }", ["iii"], [""]],
-    "34": ["{ return $0 + $1; }", ["iii"], [""]],
-    "57": ["{ Module.print(\"Got \" + $0); }", ["iii"], [""]]
+    "0": "{ Module.print(\"Hello world\"); }",
+    "34": "{ return $0 + $1; }",
+    "57": "{ Module.print(\"Got \" + $0); }"
   },
   "tableSize": 0,
   "declares": [
-- 
cgit v1.2.3