diff options
| -rw-r--r-- | src/passes/OptimizeInstructions.cpp | 5 | ||||
| -rw-r--r-- | test/lit/passes/optimize-instructions-gc-heap.wast | 47 |
2 files changed, 52 insertions, 0 deletions
diff --git a/src/passes/OptimizeInstructions.cpp b/src/passes/OptimizeInstructions.cpp index ba18bfd74..f23c119ec 100644 --- a/src/passes/OptimizeInstructions.cpp +++ b/src/passes/OptimizeInstructions.cpp @@ -1415,6 +1415,11 @@ struct OptimizeInstructions bool optimizeSubsequentStructSet(StructNew* new_, StructSet* set, Index refLocalIndex) { + // Leave unreachable code for DCE, to avoid updating types here. + if (new_->type == Type::unreachable || set->type == Type::unreachable) { + return false; + } + if (new_->isWithDefault()) { // Ignore a new_default for now. If the fields are defaultable then we // could add them, in principle, but that might increase code size. diff --git a/test/lit/passes/optimize-instructions-gc-heap.wast b/test/lit/passes/optimize-instructions-gc-heap.wast index 4554e651d..e14f101c6 100644 --- a/test/lit/passes/optimize-instructions-gc-heap.wast +++ b/test/lit/passes/optimize-instructions-gc-heap.wast @@ -710,6 +710,53 @@ ) ) + ;; CHECK: (func $unreachable + ;; CHECK-NEXT: (local $ref (ref null $struct)) + ;; CHECK-NEXT: (local.tee $ref + ;; CHECK-NEXT: (block + ;; CHECK-NEXT: (unreachable) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (struct.set $struct 0 + ;; CHECK-NEXT: (local.get $ref) + ;; CHECK-NEXT: (i32.const 10) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (nop) + ;; CHECK-NEXT: (local.set $ref + ;; CHECK-NEXT: (struct.new $struct + ;; CHECK-NEXT: (i32.const 20) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (struct.set $struct 0 + ;; CHECK-NEXT: (local.get $ref) + ;; CHECK-NEXT: (unreachable) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + (func $unreachable + (local $ref (ref null $struct)) + ;; Do not optimize unreachable code, either in the new (first pair) or the + ;; set (second pair) + (local.set $ref + (struct.new $struct + (unreachable) + ) + ) + (struct.set $struct 0 + (local.get $ref) + (i32.const 10) + ) + (nop) + (local.set $ref + (struct.new $struct + (i32.const 20) + ) + ) + (struct.set $struct 0 + (local.get $ref) + (unreachable) + ) + ) + ;; CHECK: (func $helper-i32 (param $x i32) (result i32) ;; CHECK-NEXT: (i32.const 42) ;; CHECK-NEXT: ) |