update

Author: kripken

src/tools/wasm-merge.cpp

@@ -378,8 +378,9 @@ void copyModuleContents(Module& input, Name inputName) {
       auto* callOld = builder.makeCall(merged.start, {}, Type::none);
       auto* callNew = builder.makeCall(input.start, {}, Type::none);
       auto* body = builder.makeSequence(callOld, callNew);
-      auto combinedStart = builder.makeFunction(
+      auto combined = builder.makeFunction(
         combinedName, Signature(Type::none, Type::none), {}, body);
+      merged.addFunction(std::move(combined));
       merged.start = combinedName;
     }
   }

test/lit/merge/start-return.wat

@@ -7,6 +7,16 @@
 (module
   (start $start-a)
 
+  ;; CHECK:      (type $0 (func))
+
+  ;; CHECK:      (start $merged.start.combined)
+
+  ;; CHECK:      (func $start-a (type $0)
+  ;; CHECK-NEXT:  (drop
+  ;; CHECK-NEXT:   (i32.const 0)
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT:  (return)
+  ;; CHECK-NEXT: )
   (func $start-a
     (drop
       (i32.const 0)
@@ -15,23 +25,14 @@
   )
 )
 
-;; CHECK:      (type $0 (func))
-
-;; CHECK:      (start $merged.start.old)
-
-;; CHECK:      (func $merged.start.old (type $0)
-;; CHECK-NEXT:  (block
-;; CHECK-NEXT:   (drop
-;; CHECK-NEXT:    (i32.const 0)
-;; CHECK-NEXT:   )
-;; CHECK-NEXT:   (return)
-;; CHECK-NEXT:  )
-;; CHECK-NEXT:  (call $merged.start.new)
-;; CHECK-NEXT: )
-
-;; CHECK:      (func $merged.start.new (type $0)
+;; CHECK:      (func $start-b (type $0)
 ;; CHECK-NEXT:  (drop
 ;; CHECK-NEXT:   (i32.const 1)
 ;; CHECK-NEXT:  )
 ;; CHECK-NEXT:  (return)
 ;; CHECK-NEXT: )
+
+;; CHECK:      (func $merged.start.combined (type $0)
+;; CHECK-NEXT:  (call $start-a)
+;; CHECK-NEXT:  (call $start-b)
+;; CHECK-NEXT: )

test/lit/merge/start3.wat

@@ -13,7 +13,7 @@
 
 ;; CHECK:      (export "user" (func $user))
 
-;; CHECK:      (start $merged.start.old)
+;; CHECK:      (start $merged.start.combined)
 
 ;; CHECK:      (func $start (type $0)
 ;; CHECK-NEXT:  (local $x i32)
@@ -30,20 +30,7 @@
 ;; CHECK-NEXT:  (call $start)
 ;; CHECK-NEXT: )
 
-;; CHECK:      (func $merged.start.old (type $0)
-;; CHECK-NEXT:  (local $x i32)
-;; CHECK-NEXT:  (block
-;; CHECK-NEXT:   (drop
-;; CHECK-NEXT:    (local.get $x)
-;; CHECK-NEXT:   )
-;; CHECK-NEXT:   (drop
-;; CHECK-NEXT:    (i32.const 1)
-;; CHECK-NEXT:   )
-;; CHECK-NEXT:  )
-;; CHECK-NEXT:  (call $merged.start.new)
-;; CHECK-NEXT: )
-
-;; CHECK:      (func $merged.start.new (type $0)
+;; CHECK:      (func $start_2 (type $0)
 ;; CHECK-NEXT:  (local $x f64)
 ;; CHECK-NEXT:  (drop
 ;; CHECK-NEXT:   (local.get $x)
@@ -52,3 +39,8 @@
 ;; CHECK-NEXT:   (i32.const 2)
 ;; CHECK-NEXT:  )
 ;; CHECK-NEXT: )
+
+;; CHECK:      (func $merged.start.combined (type $0)
+;; CHECK-NEXT:  (call $start)
+;; CHECK-NEXT:  (call $start_2)
+;; CHECK-NEXT: )