Make RemoveMemory pass also remove the start function

src/passes/CMakeLists.txt

@@ -102,7 +102,7 @@ set(passes_SOURCES
   TraceCalls.cpp
   RedundantSetElimination.cpp
   RemoveImports.cpp
-  RemoveMemory.cpp
+  RemoveMemoryInit.cpp
   RemoveNonJSOps.cpp
   RemoveUnusedBrs.cpp
   RemoveUnusedNames.cpp

src/passes/RemoveMemory.cpp → src/passes/RemoveMemoryInit.cpp

@@ -15,20 +15,25 @@
  */
 
 //
-// Removeds memory segments, leaving only code in the module.
-//
+// Removes memory segments, leaving only code in the module. It also removes
+// the start function, which (in LLVM use cases) is only used for initializing
+// the memory.
 
 #include <pass.h>
 #include <wasm.h>
 
 namespace wasm {
 
-struct RemoveMemory : public Pass {
+struct RemoveMemoryInit : public Pass {
   void run(Module* module) override {
     module->removeDataSegments([&](DataSegment* curr) { return true; });
+    if (module->start) {
+      module->removeFunction(module->start);
+      module->start = Name();
+    }
   }
 };
 
-Pass* createRemoveMemoryPass() { return new RemoveMemory(); }
+Pass* createRemoveMemoryInitPass() { return new RemoveMemoryInit(); }
 
 } // namespace wasm

src/passes/pass.cpp

@@ -411,8 +411,12 @@ void PassRegistry::registerPasses() {
   registerPass("remove-imports",
                "removes imports and replaces them with nops",
                createRemoveImportsPass);
-  registerPass(
-    "remove-memory", "removes memory segments", createRemoveMemoryPass);
+  registerPass("remove-memory-init",
+               "removes memory initialization",
+               createRemoveMemoryInitPass);
+  registerPass("remove-memory",
+               "removes memory init (legacy name)",
+               createRemoveMemoryInitPass);
   registerPass("remove-unused-brs",
                "removes breaks from locations that are not needed",
                createRemoveUnusedBrsPass);

src/passes/passes.h

@@ -132,7 +132,7 @@ Pass* createPrintFunctionMapPass();
 Pass* createPropagateGlobalsGloballyPass();
 Pass* createRemoveNonJSOpsPass();
 Pass* createRemoveImportsPass();
-Pass* createRemoveMemoryPass();
+Pass* createRemoveMemoryInitPass();
 Pass* createRemoveUnusedBrsPass();
 Pass* createRemoveUnusedModuleElementsPass();
 Pass* createRemoveUnusedNonFunctionModuleElementsPass();

src/tools/wasm-reduce.cpp

@@ -294,7 +294,7 @@ struct Reducer
       "--optimize-instructions",
       "--precompute",
       "--remove-imports",
-      "--remove-memory",
+      "--remove-memory-init",
       "--remove-unused-names --remove-unused-brs",
       "--remove-unused-module-elements",
       "--remove-unused-nonfunction-module-elements",

test/lit/help/wasm-metadce.test

@@ -388,7 +388,10 @@
 ;; CHECK-NEXT:   --remove-imports                              removes imports and replaces
 ;; CHECK-NEXT:                                                 them with nops
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --remove-memory                               removes memory segments
+;; CHECK-NEXT:   --remove-memory                               removes memory init (legacy
+;; CHECK-NEXT:                                                 name)
+;; CHECK-NEXT:
+;; CHECK-NEXT:   --remove-memory-init                          removes memory initialization
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --remove-non-js-ops                           removes operations incompatible
 ;; CHECK-NEXT:                                                 with js

test/lit/help/wasm-opt.test

@@ -397,7 +397,10 @@
 ;; CHECK-NEXT:   --remove-imports                              removes imports and replaces
 ;; CHECK-NEXT:                                                 them with nops
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --remove-memory                               removes memory segments
+;; CHECK-NEXT:   --remove-memory                               removes memory init (legacy
+;; CHECK-NEXT:                                                 name)
+;; CHECK-NEXT:
+;; CHECK-NEXT:   --remove-memory-init                          removes memory initialization
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --remove-non-js-ops                           removes operations incompatible
 ;; CHECK-NEXT:                                                 with js

test/lit/help/wasm2js.test

@@ -351,7 +351,10 @@
 ;; CHECK-NEXT:   --remove-imports                              removes imports and replaces
 ;; CHECK-NEXT:                                                 them with nops
 ;; CHECK-NEXT:
-;; CHECK-NEXT:   --remove-memory                               removes memory segments
+;; CHECK-NEXT:   --remove-memory                               removes memory init (legacy
+;; CHECK-NEXT:                                                 name)
+;; CHECK-NEXT:
+;; CHECK-NEXT:   --remove-memory-init                          removes memory initialization
 ;; CHECK-NEXT:
 ;; CHECK-NEXT:   --remove-non-js-ops                           removes operations incompatible
 ;; CHECK-NEXT:                                                 with js

test/lit/passes/remove-memory-init.wast

@@ -0,0 +1,19 @@
+;; RUN: wasm-opt %s --remove-memory-init -all -S -o - | filecheck %s
+
+(module
+ (type $0 (func))
+ ;; CHECK:      (memory $mem 2)
+ (memory $mem 2)
+ (data (memory $mem) (i32.const 0) "Hello, world\00")
+ (func $__wasm_init_memory (type $0)
+  (memory.fill 0
+   (i32.const 0)
+   (i32.const 0)
+   (i32.const 0)
+  )
+ )
+ (start $__wasm_init_memory)
+)
+
+;; CHECK-NOT: data
+;; CHECK-NOT: __wasm_init_memory