work

src/passes/OptimizeInstructions.cpp

@@ -1782,7 +1782,7 @@ struct OptimizeInstructions
     }
   }
 
-  void zvisitStructNew(StructNew* curr) {
+  void visitStructNew(StructNew* curr) {
     // If values are provided, but they are all the default, then we can remove
     // them (in reachable code).
     if (curr->type == Type::unreachable || curr->isWithDefault()) {

test/lit/passes/optimize-instructions-gc.wast

@@ -3174,23 +3174,26 @@
     )
   )
 
-  ;; CHECK:      (func $struct.new_with_default (type $5)
+  ;; CHECK:      (func $struct.new (type $5)
   ;; CHECK-NEXT:  (drop
-  ;; CHECK-NEXT:   (struct.new $struct
-  ;; CHECK-NEXT:    (i32.const 0)
-  ;; CHECK-NEXT:    (block (result i32)
-  ;; CHECK-NEXT:     (i32.const 0)
+  ;; CHECK-NEXT:   (block (result (ref $struct))
+  ;; CHECK-NEXT:    (drop
+  ;; CHECK-NEXT:     (block (result i32)
+  ;; CHECK-NEXT:      (call $struct.new)
+  ;; CHECK-NEXT:      (i32.const 0)
+  ;; CHECK-NEXT:     )
   ;; CHECK-NEXT:    )
-  ;; CHECK-NEXT:    (i32.const 0)
-  ;; CHECK-NEXT:    (i64.const 0)
+  ;; CHECK-NEXT:    (struct.new_default $struct)
   ;; CHECK-NEXT:   )
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  (func $struct.new_with_default
+  (func $struct.new
     (drop
       (struct.new $struct
         (i32.const 0)
         (block (result i32)
+          ;; A block in the middle, even with side effects, is no problem.
+          (call $struct.new)
           (i32.const 0)
         )
         (i32.const 0)