diff options
| -rw-r--r-- | src/passes/TypeRefining.cpp | 9 | ||||
| -rw-r--r-- | test/lit/passes/type-refining.wast | 44 |
2 files changed, 50 insertions, 3 deletions
diff --git a/src/passes/TypeRefining.cpp b/src/passes/TypeRefining.cpp index 9a0b289e5..211df8186 100644 --- a/src/passes/TypeRefining.cpp +++ b/src/passes/TypeRefining.cpp @@ -400,11 +400,16 @@ struct TypeRefining : public Pass { void visitStructSet(StructSet* curr) { if (curr->type == Type::unreachable) { + // Ignore unreachable code. + return; + } + auto type = curr->ref->type.getHeapType(); + if (type.isBottom()) { + // Ignore a bottom type. return; } - auto fieldType = - curr->ref->type.getHeapType().getStruct().fields[curr->index].type; + auto fieldType = type.getStruct().fields[curr->index].type; if (!Type::isSubType(curr->value->type, fieldType)) { curr->value = diff --git a/test/lit/passes/type-refining.wast b/test/lit/passes/type-refining.wast index fb9f29568..dac509887 100644 --- a/test/lit/passes/type-refining.wast +++ b/test/lit/passes/type-refining.wast @@ -1225,7 +1225,11 @@ (module ;; CHECK: (rec - ;; CHECK-NEXT: (type $ref|$A|_externref_=>_none (func (param (ref $A) externref))) + ;; CHECK-NEXT: (type $ref|noextern|_=>_none (func (param (ref noextern)))) + + ;; CHECK: (type $ref|none|_ref|noextern|_=>_none (func (param (ref none) (ref noextern)))) + + ;; CHECK: (type $ref|$A|_externref_=>_none (func (param (ref $A) externref))) ;; CHECK: (type $A (struct (field (mut (ref noextern))))) (type $A (struct (field (mut externref)))) @@ -1330,4 +1334,42 @@ ) ) ) + + ;; CHECK: (func $bottom.type (type $ref|none|_ref|noextern|_=>_none) (param $ref (ref none)) (param $value (ref noextern)) + ;; CHECK-NEXT: (block ;; (replaces something unreachable we can't emit) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (local.get $ref) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (local.get $value) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (unreachable) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + (func $bottom.type (param $ref (ref none)) (param $value (ref noextern)) + ;; The reference here is a bottom type, which we should not crash on. + (struct.set $A 0 + (local.get $ref) + (local.get $value) + ) + ) + + ;; CHECK: (func $unreachable (type $ref|noextern|_=>_none) (param $value (ref noextern)) + ;; CHECK-NEXT: (block ;; (replaces something unreachable we can't emit) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (unreachable) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (local.get $value) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (unreachable) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + (func $unreachable (param $value (ref noextern)) + ;; The reference here is unreachable, which we should not crash on. + (struct.set $A 0 + (unreachable) + (local.get $value) + ) + ) ) |