Remove tableSize from emscripten metadata (#4415)

sbc100 · web-flow · commit 75988573cef8 · 2021-12-28T14:53:23.000-08:00
See emscripten-core/emscripten#15855
diff --git a/src/wasm/wasm-emscripten.cpp b/src/wasm/wasm-emscripten.cpp
@@ -394,12 +394,6 @@ std::string EmscriptenGlueGenerator::generateEmscriptenMetadata() {
     meta << "\n  },\n";
   }
 
-  if (!wasm.tables.empty()) {
-    meta << "  \"tableSize\": " << wasm.tables[0]->initial.addr << ",\n";
-  } else {
-    meta << "  \"tableSize\": 0,\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
@@ -87,7 +87,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 0,
   "declares": [
     "__handle_stack_overflow"
   ],
diff --git a/test/lld/duplicate_imports.wat.out b/test/lld/duplicate_imports.wat.out
@@ -67,7 +67,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 1,
   "declares": [
     "puts"
   ],
diff --git a/test/lld/em_asm.wat.mem.out b/test/lld/em_asm.wat.mem.out
@@ -74,7 +74,6 @@
     "607": "{ return $0 + $1; }",
     "627": "{ Module.print(\"Got \" + $0); }"
   },
-  "tableSize": 1,
   "declares": [
     "emscripten_asm_const_int"
   ],
diff --git a/test/lld/em_asm.wat.out b/test/lld/em_asm.wat.out
@@ -76,7 +76,6 @@
     "607": "{ return $0 + $1; }",
     "627": "{ Module.print(\"Got \" + $0); }"
   },
-  "tableSize": 1,
   "declares": [
     "emscripten_asm_const_int"
   ],
diff --git a/test/lld/em_asm64.wat.out b/test/lld/em_asm64.wat.out
@@ -76,7 +76,6 @@
     "607": "{ return $0 + $1; }",
     "627": "{ Module.print(\"Got \" + $0); }"
   },
-  "tableSize": 1,
   "declares": [
     "emscripten_asm_const_int"
   ],
diff --git a/test/lld/em_asm_O0.wat.out b/test/lld/em_asm_O0.wat.out
@@ -99,7 +99,6 @@
     "601": "{ return $0 + $1; }",
     "621": "{ Module.print(\"Got \" + $0); }"
   },
-  "tableSize": 0,
   "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
@@ -200,7 +200,6 @@
     "601": "{ return $0 + $1; }",
     "621": "{ Module.print(\"Got \" + $0); }"
   },
-  "tableSize": 1,
   "declares": [
     "emscripten_asm_const_int_sync_on_main_thread"
   ],
diff --git a/test/lld/em_asm_pthread.wasm.out b/test/lld/em_asm_pthread.wasm.out
@@ -12847,7 +12847,6 @@
     "initPthreadsJS": "(void)<::>{ PThread.initRuntime(); }",
     "world": "()<::>{ console.log(\"World.\"); }"
   },
-  "tableSize": 5,
   "declares": [
     "emscripten_asm_const_int",
     "__cxa_thread_atexit",
diff --git a/test/lld/em_asm_shared.wat.out b/test/lld/em_asm_shared.wat.out
@@ -101,7 +101,6 @@
     "39": "{ return $0 + $1; }",
     "59": "{ Module.print(\"Got \" + $0); }"
   },
-  "tableSize": 0,
   "declares": [
     "emscripten_asm_const_int"
   ],
diff --git a/test/lld/em_asm_table.wat.out b/test/lld/em_asm_table.wat.out
@@ -32,7 +32,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 159609,
   "declares": [
     "emscripten_log",
     "emscripten_asm_const_int"
diff --git a/test/lld/em_js_O0.wat.out b/test/lld/em_js_O0.wat.out
@@ -15,7 +15,6 @@
   "emJsFuncs": {
     "noarg": "(void)<::>{ out(\"no args works\"); }"
   },
-  "tableSize": 0,
   "declares": [
   ],
   "globalImports": [
diff --git a/test/lld/hello_world.passive.wat.out b/test/lld/hello_world.passive.wat.out
@@ -40,7 +40,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 1,
   "declares": [
     "puts"
   ],
diff --git a/test/lld/hello_world.wat.mem.out b/test/lld/hello_world.wat.mem.out
@@ -28,7 +28,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 1,
   "declares": [
     "puts"
   ],
diff --git a/test/lld/hello_world.wat.out b/test/lld/hello_world.wat.out
@@ -29,7 +29,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 1,
   "declares": [
     "puts"
   ],
diff --git a/test/lld/init.wat.out b/test/lld/init.wat.out
@@ -41,7 +41,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 1,
   "declares": [
   ],
   "globalImports": [
diff --git a/test/lld/longjmp.wat.out b/test/lld/longjmp.wat.out
@@ -141,7 +141,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 2,
   "declares": [
     "malloc",
     "saveSetjmp",
diff --git a/test/lld/main_module.wat.out b/test/lld/main_module.wat.out
@@ -56,7 +56,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 0,
   "declares": [
     "puts"
   ],
diff --git a/test/lld/main_module_table.wat.out b/test/lld/main_module_table.wat.out
@@ -12,7 +12,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 0,
   "declares": [
   ],
   "globalImports": [
diff --git a/test/lld/main_module_table_2.wat.out b/test/lld/main_module_table_2.wat.out
@@ -13,7 +13,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 1,
   "declares": [
   ],
   "globalImports": [
diff --git a/test/lld/main_module_table_3.wat.out b/test/lld/main_module_table_3.wat.out
@@ -14,7 +14,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 1,
   "declares": [
   ],
   "globalImports": [
diff --git a/test/lld/main_module_table_4.wat.out b/test/lld/main_module_table_4.wat.out
@@ -15,7 +15,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 1,
   "declares": [
   ],
   "globalImports": [
diff --git a/test/lld/main_module_table_5.wat.out b/test/lld/main_module_table_5.wat.out
@@ -28,7 +28,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 1,
   "declares": [
   ],
   "globalImports": [
diff --git a/test/lld/recursive.wat.out b/test/lld/recursive.wat.out
@@ -86,7 +86,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 1,
   "declares": [
     "iprintf"
   ],
diff --git a/test/lld/recursive_safe_stack.wat.out b/test/lld/recursive_safe_stack.wat.out
@@ -175,7 +175,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 1,
   "declares": [
     "printf",
     "__handle_stack_overflow"
diff --git a/test/lld/reserved_func_ptr.wat.out b/test/lld/reserved_func_ptr.wat.out
@@ -121,7 +121,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 3,
   "declares": [
     "_Z4atoiPKc"
   ],
diff --git a/test/lld/safe_stack_standalone-wasm.wat.out b/test/lld/safe_stack_standalone-wasm.wat.out
@@ -174,7 +174,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 1,
   "declares": [
     "printf"
   ],
diff --git a/test/lld/shared.wat.out b/test/lld/shared.wat.out
@@ -53,7 +53,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 0,
   "declares": [
     "puts"
   ],
diff --git a/test/lld/shared_add_to_table.wasm.out b/test/lld/shared_add_to_table.wasm.out
@@ -71,7 +71,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 0,
   "declares": [
     "_Z16waka_func_theirsi"
   ],
diff --git a/test/lld/shared_longjmp.wat.out b/test/lld/shared_longjmp.wat.out
@@ -150,7 +150,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 0,
   "declares": [
     "malloc",
     "saveSetjmp",
diff --git a/test/lld/standalone-wasm-with-start.wat.out b/test/lld/standalone-wasm-with-start.wat.out
@@ -20,7 +20,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 1,
   "declares": [
   ],
   "globalImports": [
diff --git a/test/lld/standalone-wasm.wat.out b/test/lld/standalone-wasm.wat.out
@@ -24,7 +24,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 1,
   "declares": [
   ],
   "globalImports": [
diff --git a/test/lld/standalone-wasm2.wat.out b/test/lld/standalone-wasm2.wat.out
@@ -21,7 +21,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 0,
   "declares": [
   ],
   "globalImports": [
diff --git a/test/lld/standalone-wasm3.wat.out b/test/lld/standalone-wasm3.wat.out
@@ -14,7 +14,6 @@
 (;
 --BEGIN METADATA --
 {
-  "tableSize": 0,
   "declares": [
   ],
   "globalImports": [

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,6 @@`
`87`	`87`	`(;`
`88`	`88`	`--BEGIN METADATA --`
`89`	`89`	`{`
`90`		`- "tableSize": 0,`
`91`	`90`	`"declares": [`
`92`	`91`	`"__handle_stack_overflow"`
`93`	`92`	`],`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@`
`67`	`67`	`(;`
`68`	`68`	`--BEGIN METADATA --`
`69`	`69`	`{`
`70`		`- "tableSize": 1,`
`71`	`70`	`"declares": [`
`72`	`71`	`"puts"`
`73`	`72`	`],`