diff options
| author | Thomas Lively <7121787+tlively@users.noreply.github.com> | 2021-02-28 08:44:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 08:44:04 -0800 |
| commit | 0eb513d730b122f38bd6c66280c8acfe183b9b35 (patch) | |
| tree | aa3bfa8230b15f68dd7f4da73a3aec614e8ec4e9 /test | |
| parent | 32bfd1c5b32a1ce38da310deb67819c471becb45 (diff) | |
| download | binaryen-0eb513d730b122f38bd6c66280c8acfe183b9b35.tar.gz binaryen-0eb513d730b122f38bd6c66280c8acfe183b9b35.tar.bz2 binaryen-0eb513d730b122f38bd6c66280c8acfe183b9b35.zip | |
Consider self-referential HeapTypes to be canonical (#3626)
This PR makes the TypeBuilder move self-referential HeapTypes to global HeapType
store so that they are considered canonical. This means that when a HeapType is
constructed with an identical definition, it will be equivalent to the original
HeapType constructed by the TypeBuilder, but it does _not_ mean that
self-referential HeapTypes are deduplicated.
This fixes a bug in which two versions of each self-referential function
signature were emitted. Before this PR, the global HeapType store was not aware
of the original self-referential HeapTypes. When the function signatures were
used to construct HeapTypes during type collection, new HeapTypes were allocated
and emitted in addition to the original HeapTypes. Now the global HeapType store
returns the original HeapTypes, so the extra HeapType is never allocated.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lit/recursive-types.wast | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/test/lit/recursive-types.wast b/test/lit/recursive-types.wast index c825c9cad..7f719a359 100644 --- a/test/lit/recursive-types.wast +++ b/test/lit/recursive-types.wast @@ -2,20 +2,12 @@ ;; RUN: wasm-opt %s -all -S -o - | filecheck %s -;; TODO: Fix the bug where self-referential function signatures are emitted -;; twice. This happens because collectHeapTypes has to reconstruct a HeapType -;; from each function's signature, but self-referential HeapTypes aren't -;; canonicalized when they are parsed so collectHeapTypes ends up with a -;; separate, unfolded version of the type. - ;; TODO: Fix the bug where structurally identical types are given the same ;; generated name, making the wast invalid due to duplicate names. ;; CHECK: (module ;; CHECK-NEXT: (type $ref?|...0|_=>_ref?|...0| (func (param (ref null $ref?|...0|_=>_ref?|...0|)) (result (ref null $ref?|...0|_=>_ref?|...0|)))) ;; CHECK-NEXT: (type $ref?|...0|_=>_ref?|...0| (func (param (ref null $ref?|...0|_=>_ref?|...0|)) (result (ref null $ref?|...0|_=>_ref?|...0|)))) -;; CHECK-NEXT: (type $ref?|ref?|...0|_->_ref?|...0||_=>_ref?|ref?|...0|_->_ref?|...0|| (func (param (ref null $ref?|...0|_=>_ref?|...0|)) (result (ref null $ref?|...0|_=>_ref?|...0|)))) -;; CHECK-NEXT: (type $ref?|ref?|...0|_->_ref?|...0||_=>_ref?|ref?|...0|_->_ref?|...0|| (func (param (ref null $ref?|...0|_=>_ref?|...0|)) (result (ref null $ref?|...0|_=>_ref?|...0|)))) ;; CHECK-NEXT: (func $foo (param $0 (ref null $ref?|...0|_=>_ref?|...0|)) (result (ref null $ref?|...0|_=>_ref?|...0|)) ;; CHECK-NEXT: (unreachable) ;; CHECK-NEXT: ) |