summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/tools/wasm-emscripten-finalize.cpp14
-rw-r--r--src/wasm-emscripten.h2
-rw-r--r--src/wasm/wasm-emscripten.cpp9
-rw-r--r--test/lld/basic_safe_stack.wat.out3
-rw-r--r--test/lld/duplicate_imports.wat.out3
-rw-r--r--test/lld/em_asm.wat.mem.out3
-rw-r--r--test/lld/em_asm.wat.out3
-rw-r--r--test/lld/em_asm64.wat.out3
-rw-r--r--test/lld/em_asm_O0.wat.out3
-rw-r--r--test/lld/em_asm_main_thread.wat.out3
-rw-r--r--test/lld/hello_world.passive.wat.out3
-rw-r--r--test/lld/hello_world.wat.mem.out3
-rw-r--r--test/lld/hello_world.wat.out3
-rw-r--r--test/lld/init.wat.out3
-rw-r--r--test/lld/longjmp.wat.out3
-rw-r--r--test/lld/main_module.wat.out3
-rw-r--r--test/lld/recursive.wat.out3
-rw-r--r--test/lld/recursive_safe_stack.wat.out3
-rw-r--r--test/lld/reserved_func_ptr.wat.out3
-rw-r--r--test/lld/safe_stack_standalone-wasm.wat.out3
20 files changed, 3 insertions, 73 deletions
diff --git a/src/tools/wasm-emscripten-finalize.cpp b/src/tools/wasm-emscripten-finalize.cpp
index 71f3cf443..fc55a8d83 100644
--- a/src/tools/wasm-emscripten-finalize.cpp
+++ b/src/tools/wasm-emscripten-finalize.cpp
@@ -230,8 +230,6 @@ int main(int argc, const char* argv[]) {
generator.onlyI64DynCalls = onlyI64DynCalls;
generator.noDynCalls = noDynCalls;
- Name initializerFunction;
-
if (!standaloneWasm) {
// This is also not needed in standalone mode since standalone mode uses
// crt1.c to invoke the main and is aware of __main_argc_argv mangling.
@@ -286,21 +284,11 @@ int main(int argc, const char* argv[]) {
if (auto* e = wasm.getExportOrNull(WASM_CALL_CTORS)) {
e->name = "__post_instantiate";
}
- } else {
- BYN_TRACE("finalizing as regular module\n");
- // Costructors get called from crt1 in wasm standalone mode.
- // Unless there is no entry point.
- if (!standaloneWasm || !wasm.getExportOrNull("_start")) {
- if (auto* e = wasm.getExportOrNull(WASM_CALL_CTORS)) {
- initializerFunction = e->name;
- }
- }
}
BYN_TRACE("generated metadata\n");
// Substantial changes to the wasm are done, enough to create the metadata.
- std::string metadata =
- generator.generateEmscriptenMetadata(initializerFunction);
+ std::string metadata = generator.generateEmscriptenMetadata();
// Finally, separate out data segments if relevant (they may have been needed
// for metadata).
diff --git a/src/wasm-emscripten.h b/src/wasm-emscripten.h
index 31038aaa9..3c9cb07c5 100644
--- a/src/wasm-emscripten.h
+++ b/src/wasm-emscripten.h
@@ -33,7 +33,7 @@ public:
: wasm(wasm), builder(wasm), stackPointerOffset(stackPointerOffset),
useStackPointerGlobal(stackPointerOffset == 0) {}
- std::string generateEmscriptenMetadata(Name initializer);
+ std::string generateEmscriptenMetadata();
void fixInvokeFunctionNames();
diff --git a/src/wasm/wasm-emscripten.cpp b/src/wasm/wasm-emscripten.cpp
index 69e0618b1..2e3a5cf23 100644
--- a/src/wasm/wasm-emscripten.cpp
+++ b/src/wasm/wasm-emscripten.cpp
@@ -434,8 +434,7 @@ void printSignatures(std::ostream& o, const std::set<Signature>& c) {
o << "]";
}
-std::string
-EmscriptenGlueGenerator::generateEmscriptenMetadata(Name initializer) {
+std::string EmscriptenGlueGenerator::generateEmscriptenMetadata() {
bool commaFirst;
auto nextElement = [&commaFirst]() {
if (commaFirst) {
@@ -482,12 +481,6 @@ EmscriptenGlueGenerator::generateEmscriptenMetadata(Name initializer) {
meta << " \"tableSize\": " << wasm.table.initial.addr << ",\n";
- if (initializer.is()) {
- meta << " \"initializers\": [";
- meta << "\n \"" << initializer.c_str() << "\"";
- meta << "\n ],\n";
- }
-
// Avoid adding duplicate imports to `declares' or `invokeFuncs`. Even
// though we might import the same function multiple times (i.e. with
// different sigs) we only need to list is in the metadata once.
diff --git a/test/lld/basic_safe_stack.wat.out b/test/lld/basic_safe_stack.wat.out
index b2b7bdb16..15f108a3e 100644
--- a/test/lld/basic_safe_stack.wat.out
+++ b/test/lld/basic_safe_stack.wat.out
@@ -89,9 +89,6 @@
--BEGIN METADATA --
{
"tableSize": 1,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"__handle_stack_overflow"
],
diff --git a/test/lld/duplicate_imports.wat.out b/test/lld/duplicate_imports.wat.out
index 659b518af..09d5bb1fc 100644
--- a/test/lld/duplicate_imports.wat.out
+++ b/test/lld/duplicate_imports.wat.out
@@ -68,9 +68,6 @@
--BEGIN METADATA --
{
"tableSize": 1,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"puts"
],
diff --git a/test/lld/em_asm.wat.mem.out b/test/lld/em_asm.wat.mem.out
index 1c2f9cac9..8a24bb270 100644
--- a/test/lld/em_asm.wat.mem.out
+++ b/test/lld/em_asm.wat.mem.out
@@ -73,9 +73,6 @@
"625": ["{ Module.print(\"Got \" + $0); }", ["iii"], [""]]
},
"tableSize": 1,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"emscripten_asm_const_int"
],
diff --git a/test/lld/em_asm.wat.out b/test/lld/em_asm.wat.out
index 1df9a2703..f7655985c 100644
--- a/test/lld/em_asm.wat.out
+++ b/test/lld/em_asm.wat.out
@@ -74,9 +74,6 @@
"625": ["{ Module.print(\"Got \" + $0); }", ["iii"], [""]]
},
"tableSize": 1,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"emscripten_asm_const_int"
],
diff --git a/test/lld/em_asm64.wat.out b/test/lld/em_asm64.wat.out
index 727dc7267..35425a600 100644
--- a/test/lld/em_asm64.wat.out
+++ b/test/lld/em_asm64.wat.out
@@ -74,9 +74,6 @@
"625": ["{ Module.print(\"Got \" + $0); }", ["ijj"], [""]]
},
"tableSize": 1,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"emscripten_asm_const_int"
],
diff --git a/test/lld/em_asm_O0.wat.out b/test/lld/em_asm_O0.wat.out
index 472f5519a..48c9158bc 100644
--- a/test/lld/em_asm_O0.wat.out
+++ b/test/lld/em_asm_O0.wat.out
@@ -99,9 +99,6 @@
"621": ["{ Module.print(\"Got \" + $0); }", ["iii"], [""]]
},
"tableSize": 1,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"emscripten_asm_const_int"
],
diff --git a/test/lld/em_asm_main_thread.wat.out b/test/lld/em_asm_main_thread.wat.out
index 3c8da4177..55e992a22 100644
--- a/test/lld/em_asm_main_thread.wat.out
+++ b/test/lld/em_asm_main_thread.wat.out
@@ -199,9 +199,6 @@
"621": ["{ Module.print(\"Got \" + $0); }", ["iii"], ["sync_on_main_thread_"]]
},
"tableSize": 1,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"emscripten_asm_const_int_sync_on_main_thread"
],
diff --git a/test/lld/hello_world.passive.wat.out b/test/lld/hello_world.passive.wat.out
index 642a5ee59..df2e87368 100644
--- a/test/lld/hello_world.passive.wat.out
+++ b/test/lld/hello_world.passive.wat.out
@@ -41,9 +41,6 @@
--BEGIN METADATA --
{
"tableSize": 1,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"puts"
],
diff --git a/test/lld/hello_world.wat.mem.out b/test/lld/hello_world.wat.mem.out
index ef2f4e524..3c25ea313 100644
--- a/test/lld/hello_world.wat.mem.out
+++ b/test/lld/hello_world.wat.mem.out
@@ -29,9 +29,6 @@
--BEGIN METADATA --
{
"tableSize": 1,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"puts"
],
diff --git a/test/lld/hello_world.wat.out b/test/lld/hello_world.wat.out
index 98eb00714..dd94495c2 100644
--- a/test/lld/hello_world.wat.out
+++ b/test/lld/hello_world.wat.out
@@ -30,9 +30,6 @@
--BEGIN METADATA --
{
"tableSize": 1,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"puts"
],
diff --git a/test/lld/init.wat.out b/test/lld/init.wat.out
index 759a3f066..a9b66987c 100644
--- a/test/lld/init.wat.out
+++ b/test/lld/init.wat.out
@@ -42,9 +42,6 @@
--BEGIN METADATA --
{
"tableSize": 1,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
],
"externs": [
diff --git a/test/lld/longjmp.wat.out b/test/lld/longjmp.wat.out
index ffe918495..9be7a12c7 100644
--- a/test/lld/longjmp.wat.out
+++ b/test/lld/longjmp.wat.out
@@ -142,9 +142,6 @@
--BEGIN METADATA --
{
"tableSize": 2,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"malloc",
"saveSetjmp",
diff --git a/test/lld/main_module.wat.out b/test/lld/main_module.wat.out
index 253cc409f..60013d46b 100644
--- a/test/lld/main_module.wat.out
+++ b/test/lld/main_module.wat.out
@@ -57,9 +57,6 @@
--BEGIN METADATA --
{
"tableSize": 0,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"puts"
],
diff --git a/test/lld/recursive.wat.out b/test/lld/recursive.wat.out
index 9afccbfa4..e51c9f525 100644
--- a/test/lld/recursive.wat.out
+++ b/test/lld/recursive.wat.out
@@ -87,9 +87,6 @@
--BEGIN METADATA --
{
"tableSize": 1,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"iprintf"
],
diff --git a/test/lld/recursive_safe_stack.wat.out b/test/lld/recursive_safe_stack.wat.out
index 718478061..5043fc6e8 100644
--- a/test/lld/recursive_safe_stack.wat.out
+++ b/test/lld/recursive_safe_stack.wat.out
@@ -176,9 +176,6 @@
--BEGIN METADATA --
{
"tableSize": 1,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"printf",
"__handle_stack_overflow"
diff --git a/test/lld/reserved_func_ptr.wat.out b/test/lld/reserved_func_ptr.wat.out
index 69a66de0f..7dbd69c87 100644
--- a/test/lld/reserved_func_ptr.wat.out
+++ b/test/lld/reserved_func_ptr.wat.out
@@ -122,9 +122,6 @@
--BEGIN METADATA --
{
"tableSize": 3,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"_Z4atoiPKc"
],
diff --git a/test/lld/safe_stack_standalone-wasm.wat.out b/test/lld/safe_stack_standalone-wasm.wat.out
index cfb8dd86c..b9ee7bdea 100644
--- a/test/lld/safe_stack_standalone-wasm.wat.out
+++ b/test/lld/safe_stack_standalone-wasm.wat.out
@@ -175,9 +175,6 @@
--BEGIN METADATA --
{
"tableSize": 1,
- "initializers": [
- "__wasm_call_ctors"
- ],
"declares": [
"printf"
],
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-05 23:42:37 +0000