wasm-merge: When fixing name collisions, do not collide in either module#8836
Merged
Conversation
tlively
reviewed
Jun 12, 2026
| auto name = Names::getValidFunctionName(merged, curr->name); | ||
| auto name = getValidName( | ||
| curr->name, | ||
| [&](Name test) { return merged.getFunctionOrNull(test); }, |
Member
There was a problem hiding this comment.
This could all be a little more concise if you just passed a method pointer, e.g. Module::getFunctionOrNull, and getValidName took care of calling the method on both merged and input.
Member
Author
There was a problem hiding this comment.
Done, it is indeed a little shorter that way.
tlively
approved these changes
Jun 12, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When a name
$aappears in both modules, we picked a new name not inthe first module. But if the new name, something like
$a_1, is in thesecond module, that is also a problem: we will get mixed up about what in
the second module is what. To avoid this, when handling a name collision,
just pick a totally novel name.
Fixes #8835