fix(es/minifier): Fix detection of direct eval
#6215
Merged
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
kdy1
changed the title
eval
kdy1
changed the title
evaleval
kdy1
commented
Oct 20, 2022
| c(); | ||
| var d = a.b; | ||
| d(); | ||
| var e = eval; |
There was a problem hiding this comment.
This is an indirect eval, so it cannot use c nor b
kdy1
commented
Oct 20, 2022
| foo(); | ||
| (0, foo.bar)(); | ||
| (0, eval)("console.log(foo);"); |
There was a problem hiding this comment.
This is also an indirect eval, so we can mangle names
![kodiakhq[bot]](https://avatars.githubusercontent.com/in/29196?s=60&v=4){kind=small}
kdy1
commented
Oct 20, 2022
| var i = e[r] = { | ||
| exports: {} | ||
| }; | ||
| return t[r](i, i.exports, o), i.exports; |
|
Does this also fix #5068? |
|
No |
|
Actually this is a workaround and we should fix #5068 ideally |
jridgewell
approved these changes
Oct 21, 2022
Comment on lines
+37
to
+39
| if let Callee::Expr(e) = c { | ||
| if let Expr::Ident(Ident { | ||
| sym: js_word!("eval"), |
There was a problem hiding this comment.
Not sure how you represent optional chains, but eval?.() is not a direct eval either.
There was a problem hiding this comment.
Oh it was OptCall which does not contain Callee
| function f1(a, eval, c, d, e) { | ||
| return a("c") + eval; | ||
| function f1(n, eval, c, r, t) { | ||
| return n("c") + eval; |
There was a problem hiding this comment.
Nit: this eval can be renamed.
There was a problem hiding this comment.
I added code to explicitly prevent it because terser does so.
swc-bot
reviewed
Oct 21, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description:
The existence of
evalmake the name mangler abort, but partial try logic causes minifier to generate an invalid code.This is what I get if I disable eval detection.
With eval detection, I get
which is wrong
Related issue:
Investigation
Conclusion
evalbreaks the name mangler.