Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(es/minifier): Abort sequential inliner on optional chaining #6637

Merged
merged 29 commits into from Dec 14, 2022
Merged

fix(es/minifier): Abort sequential inliner on optional chaining #6637

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7c28495
Add tests
kdy1 Dec 13, 2022
eb4464a
config.json
kdy1 Dec 13, 2022
2896445
Update test refs (correct)
kdy1 Dec 13, 2022
f6db660
Reduce
kdy1 Dec 13, 2022
e69fe49
config.json
kdy1 Dec 13, 2022
ec56c8b
Remove
kdy1 Dec 13, 2022
d331306
Remove
kdy1 Dec 13, 2022
1401352
Remove
kdy1 Dec 13, 2022
249e794
Update test refs (correct)
kdy1 Dec 13, 2022
cc99469
Remove
kdy1 Dec 13, 2022
6ec98dc
Remove
kdy1 Dec 13, 2022
8df9654
passes
kdy1 Dec 13, 2022
77380cd
Fix
kdy1 Dec 13, 2022
ede8a15
Revert "Fix"
kdy1 Dec 13, 2022
ec7a818
Prepare reducing
kdy1 Dec 13, 2022
4b0bbfc
Reduce
kdy1 Dec 13, 2022
d3643e9
Reduce
kdy1 Dec 13, 2022
ea9e941
Reduce
kdy1 Dec 13, 2022
3585826
Reduce
kdy1 Dec 13, 2022
3273924
Reduce
kdy1 Dec 13, 2022
7e9c1d5
Reduce
kdy1 Dec 13, 2022
6005265
Reduce
kdy1 Dec 13, 2022
6394548
Reduce
kdy1 Dec 13, 2022
0410a6c
Revert "Revert "Fix""
kdy1 Dec 13, 2022
95384ce
Update test refs
kdy1 Dec 13, 2022
26c0862
Reduce
kdy1 Dec 14, 2022
cef1be2
Update test refs
kdy1 Dec 14, 2022
9c16c9d
Merge branch 'main' into issue-6636
swc-bot Dec 14, 2022
6104977
Merge branch 'main' into issue-6636
swc-bot Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion crates/swc_ecma_minifier/src/compress/optimize/sequences.rs
View file
Open in desktop
Expand Up @@ -1546,7 +1546,9 @@ where
}

match b {
Expr::Update(..) | Expr::Arrow(..) | Expr::Fn(..) => return Ok(false),
Expr::Update(..) | Expr::Arrow(..) | Expr::Fn(..) | Expr::OptChain(..) => {
return Ok(false)
}

Expr::Cond(b) => {
trace_op!("seq: Try test of cond");
Expand Down
7 changes: 7 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/6636/config.json
View file
Open in desktop
@@ -0,0 +1,7 @@
{
"passes": 2,
"toplevel": true,
"defaults": true,
"sequences": true,
"collapse_vars": true
}
23 changes: 23 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/6636/input.js
View file
Open in desktop
@@ -0,0 +1,23 @@
export function memo(getDeps, fn, opts) {
let deps = [];
let result;
return () => {
let depTime;
if (opts.key && opts.debug) depTime = Date.now();
const newDeps = getDeps();
const depsChanged = newDeps.length !== deps.length || newDeps.some((dep, index) => deps[index] !== dep);
if (!depsChanged) {
return result;
}
deps = newDeps;
let resultTime;
if (opts.key && opts.debug) resultTime = Date.now();
result = fn(...newDeps);
opts?.onChange?.(result);
if (opts.key && opts.debug) {
if (opts?.debug()) {
}
}
return result;
};
}
8 changes: 8 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/6636/output.js
View file
Open in desktop
@@ -0,0 +1,8 @@
export function memo(getDeps, fn, opts) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previous output:

export function memo(getDeps, fn, opts) {
    let result, deps = [];
    return ()=>{
        opts.key && opts.debug && Date.now();
        const newDeps = getDeps(), depsChanged = newDeps.length !== deps.length || newDeps.some((dep, index)=>deps[index] !== dep);
        return depsChanged && (deps = newDeps, opts.key && opts.debug && Date.now(), opts?.onChange?.(result = fn(...newDeps)), opts.key && opts.debug && opts?.debug()), result;
    };
}

let result, deps = [];
return ()=>{
opts.key && opts.debug && Date.now();
const newDeps = getDeps(), depsChanged = newDeps.length !== deps.length || newDeps.some((dep, index)=>deps[index] !== dep);
return depsChanged && (deps = newDeps, opts.key && opts.debug && Date.now(), result = fn(...newDeps), opts?.onChange?.(result), opts.key && opts.debug && opts?.debug()), result;
};
}