Fix collisions between original property and mangled property #1063
Conversation
This file contains 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
| @@ -167,9 +167,6 @@ function mangle_properties(ast, options) { | |||
| var private_cache = new Map(); | |||
| if (options.cache) { | |||
| cache = options.cache.props; | |||
| cache.forEach(function(mangled_name) { | |||
| reserved.add(mangled_name); | |||
| }); | |||
There was a problem hiding this comment.
I think we should instead be pushing to unmangleable. It fulfills the same role as reserved, but is only checked when nth_identifier comes up with a new mangled name.
The reason this was added was to stop mangling from creating colliding names, eg. if something mangles to X but there's already an X in a previous file that Terser mangled.
Here's when/why these lines were added, for more context:
There was a problem hiding this comment.
Would've added a fancy GH suggestion, but unmangleable is defined after this so it's not as simple as that.
There was a problem hiding this comment.
Good catch. Fixed, and updated the test for this case.
fabiosantoscode
approved these changes
Sep 11, 2021
This fixes a bug when an original property (`obj.i`) shares the same name as a mangled property (`obj.prop` -> `n.i`), and you're using a name-cache. Because our mangled name collides, we have to ensure all original `.i` properties are renamed to something else (`n.o`). But, because we had a name-cache, we would reserve the mangled property name in the mangler. That prevents us from attempting to rename the original `.i` property to `.o`.
jridgewell
force-pushed
the
consistent-name-cache
branch
from
0605bc3
to
7ac3aca
Compare
jridgewell
force-pushed
the
consistent-name-cache
branch
from
7ac3aca
to
5a9d757
Compare
5 tasks
|
Great stuff, thanks 💪 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This fixes a bug when an original property (
obj.i) shares the same name as a mangled property (obj.prop->n.i), and you're using a name-cache. Because our mangled name collides, we have to ensure all original.iproperties are renamed to something else (n.o).But, because we had a name-cache, we would reserve the mangled property name in the mangler. That prevents us from attempting to rename the original
.iproperty to.o.Fixes #233.