diff options
| -rw-r--r-- | src/ir/type-updating.cpp | 23 | ||||
| -rw-r--r-- | src/passes/RemoveUnusedTypes.cpp | 2 | ||||
| -rw-r--r-- | test/lit/passes/signature-pruning.wast | 3 |
3 files changed, 23 insertions, 5 deletions
diff --git a/src/ir/type-updating.cpp b/src/ir/type-updating.cpp index 760d71b9c..520408d44 100644 --- a/src/ir/type-updating.cpp +++ b/src/ir/type-updating.cpp @@ -18,6 +18,7 @@ #include "find_all.h" #include "ir/local-structural-dominance.h" #include "ir/module-utils.h" +#include "ir/names.h" #include "ir/utils.h" #include "support/topological_sort.h" #include "wasm-type-ordering.h" @@ -152,11 +153,27 @@ GlobalTypeRewriter::TypeMap GlobalTypeRewriter::rebuildTypes( oldToNewTypes[type] = newTypes[index]; } - // Update type names (doing it before mapTypes can help debugging there, but - // has no other effect; mapTypes does not look at type names). + // Update type names to avoid duplicates. + std::unordered_set<Name> typeNames; + for (auto& [type, info] : wasm.typeNames) { + typeNames.insert(info.name); + } for (auto& [old, new_] : oldToNewTypes) { + if (old == new_) { + // The type is being mapped to itself; no need to rename anything. + continue; + } + if (auto it = wasm.typeNames.find(old); it != wasm.typeNames.end()) { - wasm.typeNames[new_] = it->second; + wasm.typeNames[new_] = wasm.typeNames[old]; + // Use the existing name in the new type, as usually it completely + // replaces the old. Rename the old name in a unique way to avoid + // confusion in the case that it remains used. + auto deduped = + Names::getValidName(wasm.typeNames[old].name, + [&](Name test) { return !typeNames.count(test); }); + wasm.typeNames[old].name = deduped; + typeNames.insert(deduped); } } diff --git a/src/passes/RemoveUnusedTypes.cpp b/src/passes/RemoveUnusedTypes.cpp index 1ea65fb0f..45222708a 100644 --- a/src/passes/RemoveUnusedTypes.cpp +++ b/src/passes/RemoveUnusedTypes.cpp @@ -45,7 +45,7 @@ struct RemoveUnusedTypes : Pass { } // We're not changing the contents of any of the types, so we just round - // trip them throgh GlobalTypeRewriter, which will put all the private types + // trip them through GlobalTypeRewriter which will put all the private types // in a single new rec group and leave out all the unused types. GlobalTypeRewriter(*module).update(); } diff --git a/test/lit/passes/signature-pruning.wast b/test/lit/passes/signature-pruning.wast index c273d1588..8754c8189 100644 --- a/test/lit/passes/signature-pruning.wast +++ b/test/lit/passes/signature-pruning.wast @@ -1168,10 +1168,11 @@ ;; CHECK: (rec ;; CHECK-NEXT: (type $none (func)) (type $none (func)) - ;; CHECK: (type $much (func (param i32))) (type $much (func (param i32))) ) + ;; CHECK: (type $much_0 (func (param i32))) + ;; CHECK: (export "exported" (func $exported)) ;; CHECK: (func $exported (type $none) |