diff options
| author | Thomas Lively <7121787+tlively@users.noreply.github.com> | 2021-05-18 15:58:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-18 15:58:31 -0700 |
| commit | 92b0cbdd9e2747c5cf6ecc546718d0ec0b1bc64b (patch) | |
| tree | 988bdc1753ba73f41b7c2c5613170fa638a1e5f9 /src/wasm-stack.h | |
| parent | f8bb9c228446998882edea012bf9fa3004262504 (diff) | |
| download | binaryen-92b0cbdd9e2747c5cf6ecc546718d0ec0b1bc64b.tar.gz binaryen-92b0cbdd9e2747c5cf6ecc546718d0ec0b1bc64b.tar.bz2 binaryen-92b0cbdd9e2747c5cf6ecc546718d0ec0b1bc64b.zip | |
Remove Type ordering (#3793)
As found in #3682, the current implementation of type ordering is not correct,
and although the immediate issue would be easy to fix, I don't think the current
intended comparison algorithm is correct in the first place. Rather than try to
switch to using a correct algorithm (which I am not sure I know how to
implement, although I have an idea) this PR removes Type ordering entirely. In
places that used Type ordering with std::set or std::map because they require
deterministic iteration order, this PR uses InsertOrdered{Set,Map} instead.
Diffstat (limited to 'src/wasm-stack.h')
| -rw-r--r-- | src/wasm-stack.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wasm-stack.h b/src/wasm-stack.h index 38b64dff4..f114bf43e 100644 --- a/src/wasm-stack.h +++ b/src/wasm-stack.h @@ -20,6 +20,7 @@ #include "ir/branch-utils.h" #include "ir/properties.h" #include "pass.h" +#include "support/insert_ordered.h" #include "wasm-binary.h" #include "wasm-traversal.h" #include "wasm.h" @@ -141,7 +142,7 @@ private: // Keeps track of the binary index of the scratch locals used to lower // tuple.extract. - std::map<Type, Index> scratchLocals; + InsertOrderedMap<Type, Index> scratchLocals; void countScratchLocals(); void setScratchLocals(); }; |