diff options
| -rwxr-xr-x | scripts/fuzz_opt.py | 3 | ||||
| -rw-r--r-- | src/passes/OptimizeInstructions.cpp | 4 | ||||
| -rw-r--r-- | test/lit/passes/optimize-instructions-gc.wast | 34 |
3 files changed, 37 insertions, 4 deletions
diff --git a/scripts/fuzz_opt.py b/scripts/fuzz_opt.py index 17d6301dd..73de5d8e2 100755 --- a/scripts/fuzz_opt.py +++ b/scripts/fuzz_opt.py @@ -173,6 +173,9 @@ IMPORTANT_INITIAL_CONTENTS = [ # frequently. os.path.join('lit', 'passes', 'once-reduction.wast'), os.path.join('passes', 'remove-unused-brs_enable-multivalue.wast'), + os.path.join('lit', 'passes', 'optimize-instructions-bulk-memory.wast'), + os.path.join('lit', 'passes', 'optimize-instructions-ignore-traps.wast'), + os.path.join('lit', 'passes', 'optimize-instructions-gc.wast'), ] IMPORTANT_INITIAL_CONTENTS = [os.path.join(shared.get_test_dir('.'), t) for t in IMPORTANT_INITIAL_CONTENTS] diff --git a/src/passes/OptimizeInstructions.cpp b/src/passes/OptimizeInstructions.cpp index 217312501..e48eecb72 100644 --- a/src/passes/OptimizeInstructions.cpp +++ b/src/passes/OptimizeInstructions.cpp @@ -1450,6 +1450,10 @@ struct OptimizeInstructions } void visitRefTest(RefTest* curr) { + if (curr->type == Type::unreachable) { + return; + } + // See above in RefCast. if (!canBeCastTo(curr->ref->type.getHeapType(), curr->rtt->type.getHeapType())) { diff --git a/test/lit/passes/optimize-instructions-gc.wast b/test/lit/passes/optimize-instructions-gc.wast index 2f6ae858d..a3f91c756 100644 --- a/test/lit/passes/optimize-instructions-gc.wast +++ b/test/lit/passes/optimize-instructions-gc.wast @@ -22,6 +22,10 @@ ;; NOMNL: (type $B (struct (field i32) (field i32) (field f32)) (extends $A)) (type $B (struct (field i32) (field i32) (field f32)) (extends $A)) + ;; CHECK: (type $A (struct (field i32))) + ;; NOMNL: (type $A (struct (field i32))) + (type $A (struct (field i32))) + ;; CHECK: (type $empty (struct )) ;; NOMNL: (type $empty (struct )) (type $empty (struct)) @@ -30,10 +34,6 @@ ;; NOMNL: (type $C (struct (field i32) (field i32) (field f64)) (extends $A)) (type $C (struct (field i32) (field i32) (field f64)) (extends $A)) - ;; CHECK: (type $A (struct (field i32))) - ;; NOMNL: (type $A (struct (field i32))) - (type $A (struct (field i32))) - ;; CHECK: (import "env" "get-i32" (func $get-i32 (result i32))) ;; NOMNL: (import "env" "get-i32" (func $get-i32 (result i32))) (import "env" "get-i32" (func $get-i32 (result i32))) @@ -1883,4 +1883,30 @@ ) ) ) + ;; CHECK: (func $ref.test-unreachable (param $A (ref null $A)) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (ref.test + ;; CHECK-NEXT: (unreachable) + ;; CHECK-NEXT: (rtt.canon $A) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; NOMNL: (func $ref.test-unreachable (param $A (ref null $A)) + ;; NOMNL-NEXT: (drop + ;; NOMNL-NEXT: (ref.test + ;; NOMNL-NEXT: (unreachable) + ;; NOMNL-NEXT: (rtt.canon $A) + ;; NOMNL-NEXT: ) + ;; NOMNL-NEXT: ) + ;; NOMNL-NEXT: ) + (func $ref.test-unreachable (param $A (ref null $A)) + (drop + ;; We should ignore unreachable ref.tests and not try to compare their + ;; HeapTypes. + (ref.test + (unreachable) + (rtt.canon $A) + ) + ) + ) ) |