JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4141 from alexlamsl/unused

Browse Source 
enhance `unused`
This commit is contained in:
Alex Lam S.L
2020-09-22 02:21:43 +01:00
committed by GitHub
parent 0e3da27727 8c670cae93
commit 12ac49b970
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/compress.js
View File

@@ -771,6 +771,7 @@ merge(Compressor.prototype, {
var j = fn.argnames.indexOf(arg); var j = fn.argnames.indexOf(arg);
return (j < 0 ? value : iife.args[j]) || make_node(AST_Undefined, iife); return (j < 0 ? value : iife.args[j]) || make_node(AST_Undefined, iife);
}; };
d.fixed.assigns = [ arg ];
} else { } else {
d.fixed = false; d.fixed = false;
} }
@@ -4649,7 +4650,9 @@ merge(Compressor.prototype, {
return true; // don't go in nested scopes return true; // don't go in nested scopes
} }
if (node instanceof AST_SymbolFunarg && scope === self) { if (node instanceof AST_SymbolFunarg && scope === self) {
var_defs_by_id.add(node.definition().id, node); var node_def = node.definition();
var_defs_by_id.add(node_def.id, node);
assignments.add(node_def.id, node);
} }
if (node instanceof AST_Definitions && scope === self) { if (node instanceof AST_Definitions && scope === self) {
node.definitions.forEach(function(def) { node.definitions.forEach(function(def) {
@@ -4790,7 +4793,8 @@ merge(Compressor.prototype, {
var trim = compressor.drop_fargs(node, parent); var trim = compressor.drop_fargs(node, parent);
for (var a = node.argnames, i = a.length; --i >= 0;) { for (var a = node.argnames, i = a.length; --i >= 0;) {
var sym = a[i]; var sym = a[i];
if (!(sym.definition().id in in_use_ids)) { var def = sym.definition();
if (!(def.id in in_use_ids)) {
sym.__unused = true; sym.__unused = true;
if (trim) { if (trim) {
log(sym, "Dropping unused function argument {name}"); log(sym, "Dropping unused function argument {name}");
@@ -4798,6 +4802,7 @@ merge(Compressor.prototype, {
} }
} else { } else {
trim = false; trim = false;
if (indexOf_assign(def, sym) < 0) sym.__unused = null;
} }
} }
fns_with_marked_args.push(node); fns_with_marked_args.push(node);
@@ -6457,10 +6462,10 @@ merge(Compressor.prototype, {
var side_effects = []; var side_effects = [];
for (var i = 0; i < args.length; i++) { for (var i = 0; i < args.length; i++) {
var trim = i >= fn.argnames.length; var trim = i >= fn.argnames.length;
if (trim || fn.argnames[i].__unused) { if (trim || "__unused" in fn.argnames[i]) {
var node = args[i].drop_side_effect_free(compressor); var node = args[i].drop_side_effect_free(compressor);
if (drop_fargs) { if (drop_fargs && (trim || fn.argnames[i].__unused)) {
fn.argnames.splice(i, 1); if (!trim) fn.argnames.splice(i, 1);
args.splice(i, 1); args.splice(i, 1);
if (node) side_effects.push(node); if (node) side_effects.push(node);
i--; i--;

2
test/compress/functions.js
View File

@@ -2676,7 +2676,7 @@ cross_references_3: {
}; };
return Math.square(n) + Math.cube(n); return Math.square(n) + Math.cube(n);
}; };
}(Math)(2)); }()(2));
console.log(Math.square(3), Math.cube(3)); console.log(Math.square(3), Math.cube(3));
} }
expect_stdout: [ expect_stdout: [

2
test/compress/reduce_vars.js
View File

@@ -2415,7 +2415,7 @@ redefine_farg_2: {
console.log(typeof [], "number",function(a, b) { console.log(typeof [], "number",function(a, b) {
a = b; a = b;
return typeof a; return typeof a;
}([])); }());
} }
expect_stdout: "object number undefined" expect_stdout: "object number undefined"
} }