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): Fix infinite loops #4250

Merged
merged 6 commits into from
Apr 5, 2022
Merged

fix(es/minifier): Fix infinite loops #4250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b319ba
Add a test
kdy1 Apr 5, 2022
6b0cc42
Add a test
kdy1 Apr 5, 2022
238f544
Fix
kdy1 Apr 5, 2022
0fc8691
More fix
kdy1 Apr 5, 2022
b527d32
Update test refs
kdy1 Apr 5, 2022
0a8af8d
Update test refs
kdy1 Apr 5, 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
7 changes: 7 additions & 0 deletions crates/swc/tests/fixture/issues-4xxx/issue-4249/1/input/.swcrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"jsc": {
"minify": {
"compress": true
}
}
}
17 changes: 17 additions & 0 deletions crates/swc/tests/fixture/issues-4xxx/issue-4249/1/input/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
foo({
bar: function bar(data, baz) {
if (
!(baz ? data.quxA : data.quxB) &&
!(baz ? data.corgeA : data.corgeB) &&
(baz ? data.get("waldo") : data.waldo)
) {
pass();
} else if (
!(baz ? data.quxA : data.quxB) &&
!(baz ? data.get("waldo") : data.waldo) &&
(baz ? data.corgeA : data.corgeB)
) {
pass();
}
}
});
5 changes: 5 additions & 0 deletions crates/swc/tests/fixture/issues-4xxx/issue-4249/1/output/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
foo({
bar: function(data, baz) {
!(!(baz ? data.quxA : data.quxB) && !(baz ? data.corgeA : data.corgeB) && (baz ? data.get("waldo") : data.waldo)) ? (baz ? data.quxA : data.quxB) || (baz ? data.get("waldo") : data.waldo) || (baz ? !data.corgeA : !data.corgeB) || pass() : pass();
}
});
1 change: 0 additions & 1 deletion crates/swc_ecma_minifier/src/compress/optimize/conditionals.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ where
}

if negate_cost(&stmt.test, true, false) < 0 {
self.changed = true;
tracing::debug!("if_return: Negating `cond` of an if statement which has cons and alt");
let ctx = Ctx {
in_bool_ctx: true,
Expand Down
1 change: 0 additions & 1 deletion crates/swc_ecma_minifier/src/compress/pure/bools.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ impl Pure<'_> {
return;
}
tracing::debug!("bools: Optimizing `!(a && b)` as `!a || !b`");
self.changed = true;
self.negate(arg, false, false);
*e = *arg.take();
}
Expand Down
1 change: 0 additions & 1 deletion crates/swc_ecma_minifier/src/compress/pure/conds.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ impl Pure<'_> {
return;
}

self.changed = true;
tracing::debug!("conditionals: `a ? foo : bar` => `!a ? bar : foo` (considered cost)");
let start_str = dump(&*cond, false);

Expand Down
194 changes: 194 additions & 0 deletions crates/swc_ecma_minifier/tests/compress/fixture/issues/4249/analysis-snapshot.rust-debug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
TestSnapshot {
vars: [
(
(
Atom('bar' type=inline),
#2,
),
VarUsageInfo {
inline_prevented: false,
ref_count: 0,
cond_init: false,
declared: false,
declared_count: 0,
declared_as_fn_param: false,
declared_as_fn_expr: true,
assign_count: 0,
mutation_by_call_count: 0,
usage_count: 0,
reassigned_with_assignment: false,
reassigned_with_var_decl: false,
mutated: false,
has_property_access: false,
has_property_mutation: false,
accessed_props: {},
exported: false,
used_above_decl: false,
is_fn_local: false,
used_by_nested_fn: false,
executed_multiple_time: false,
used_in_cond: false,
var_kind: None,
var_initialized: false,
declared_as_catch_param: false,
no_side_effect_for_member_access: false,
used_as_callee: false,
used_as_arg: false,
pure_fn: false,
infects: [],
},
),
(
(
Atom('baz' type=inline),
#2,
),
VarUsageInfo {
inline_prevented: false,
ref_count: 6,
cond_init: false,
declared: true,
declared_count: 1,
declared_as_fn_param: true,
declared_as_fn_expr: false,
assign_count: 0,
mutation_by_call_count: 6,
usage_count: 6,
reassigned_with_assignment: false,
reassigned_with_var_decl: false,
mutated: true,
has_property_access: false,
has_property_mutation: false,
accessed_props: {},
exported: false,
used_above_decl: false,
is_fn_local: true,
used_by_nested_fn: true,
executed_multiple_time: false,
used_in_cond: true,
var_kind: None,
var_initialized: false,
declared_as_catch_param: false,
no_side_effect_for_member_access: false,
used_as_callee: false,
used_as_arg: false,
pure_fn: false,
infects: [],
},
),
(
(
Atom('data' type=inline),
#2,
),
VarUsageInfo {
inline_prevented: false,
ref_count: 12,
cond_init: false,
declared: true,
declared_count: 1,
declared_as_fn_param: true,
declared_as_fn_expr: false,
assign_count: 0,
mutation_by_call_count: 0,
usage_count: 12,
reassigned_with_assignment: false,
reassigned_with_var_decl: false,
mutated: false,
has_property_access: true,
has_property_mutation: false,
accessed_props: {},
exported: false,
used_above_decl: false,
is_fn_local: true,
used_by_nested_fn: true,
executed_multiple_time: false,
used_in_cond: true,
var_kind: None,
var_initialized: false,
declared_as_catch_param: false,
no_side_effect_for_member_access: false,
used_as_callee: false,
used_as_arg: false,
pure_fn: false,
infects: [],
},
),
(
(
Atom('foo' type=inline),
#1,
),
VarUsageInfo {
inline_prevented: false,
ref_count: 1,
cond_init: false,
declared: false,
declared_count: 0,
declared_as_fn_param: false,
declared_as_fn_expr: false,
assign_count: 0,
mutation_by_call_count: 0,
usage_count: 1,
reassigned_with_assignment: false,
reassigned_with_var_decl: false,
mutated: false,
has_property_access: false,
has_property_mutation: false,
accessed_props: {},
exported: false,
used_above_decl: true,
is_fn_local: true,
used_by_nested_fn: false,
executed_multiple_time: false,
used_in_cond: false,
var_kind: None,
var_initialized: false,
declared_as_catch_param: false,
no_side_effect_for_member_access: false,
used_as_callee: true,
used_as_arg: false,
pure_fn: false,
infects: [],
},
),
(
(
Atom('pass' type=inline),
#1,
),
VarUsageInfo {
inline_prevented: false,
ref_count: 2,
cond_init: false,
declared: false,
declared_count: 0,
declared_as_fn_param: false,
declared_as_fn_expr: false,
assign_count: 0,
mutation_by_call_count: 2,
usage_count: 2,
reassigned_with_assignment: false,
reassigned_with_var_decl: false,
mutated: true,
has_property_access: false,
has_property_mutation: false,
accessed_props: {},
exported: false,
used_above_decl: true,
is_fn_local: true,
used_by_nested_fn: true,
executed_multiple_time: false,
used_in_cond: true,
var_kind: None,
var_initialized: false,
declared_as_catch_param: false,
no_side_effect_for_member_access: false,
used_as_callee: true,
used_as_arg: false,
pure_fn: false,
infects: [],
},
),
],
}
17 changes: 17 additions & 0 deletions crates/swc_ecma_minifier/tests/compress/fixture/issues/4249/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
foo({
bar: function bar(data, baz) {
if (
!(baz ? data.quxA : data.quxB) &&
!(baz ? data.corgeA : data.corgeB) &&
(baz ? data.get("waldo") : data.waldo)
) {
pass();
} else if (
!(baz ? data.quxA : data.quxB) &&
!(baz ? data.get("waldo") : data.waldo) &&
(baz ? data.corgeA : data.corgeB)
) {
pass();
}
}
});
5 changes: 5 additions & 0 deletions crates/swc_ecma_minifier/tests/compress/fixture/issues/4249/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
foo({
bar: function(data, baz) {
!(!(baz ? data.quxA : data.quxB) && !(baz ? data.corgeA : data.corgeB) && (baz ? data.get("waldo") : data.waldo)) ? (baz ? data.quxA : data.quxB) || (baz ? data.get("waldo") : data.waldo) || (baz ? !data.corgeA : !data.corgeB) || pass() : pass();
}
});