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

fix corner case in functions (#3930)

Browse Source 
fixes #3929
This commit is contained in:
Alex Lam S.L
2020-05-28 13:07:36 +01:00
committed by GitHub
parent 7840746bd9
commit d47ea77811
2 changed files with 53 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/compress.js
View File

@@ -4360,7 +4360,7 @@ merge(Compressor.prototype, {
if (def.value && indexOf_assign(sym, def) < 0) { if (def.value && indexOf_assign(sym, def) < 0) {
def.value = def.value.drop_side_effect_free(compressor); def.value = def.value.drop_side_effect_free(compressor);
} }
var var_defs = var_defs_by_id.get(sym.id); var old_def, var_defs = var_defs_by_id.get(sym.id);
if (!def.value) { if (!def.value) {
if (var_defs.length > 1) { if (var_defs.length > 1) {
AST_Node.warn("Dropping duplicated declaration of variable {name} [{file}:{line},{col}]", template(def.name)); AST_Node.warn("Dropping duplicated declaration of variable {name} [{file}:{line},{col}]", template(def.name));
@@ -4375,23 +4375,23 @@ merge(Compressor.prototype, {
&& sym.assignments == 0 && sym.assignments == 0
&& def.value === def.name.fixed_value() && def.value === def.name.fixed_value()
&& def.value instanceof AST_Function && def.value instanceof AST_Function
&& !(def.value.name && def.value.name.definition().assignments) && (!def.value.name || (old_def = def.value.name.definition()).assignments == 0
&& (old_def.name == def.name.name || all(old_def.references, function(ref) {
return ref.scope.find_variable(def.name) === def.name.definition();
})))
&& can_rename(def.value, def.name.name) && can_rename(def.value, def.name.name)
&& (!compressor.has_directive("use strict") || parent instanceof AST_Scope)) { && (!compressor.has_directive("use strict") || parent instanceof AST_Scope)) {
AST_Node.warn("Declaring {name} as function [{file}:{line},{col}]", template(def.name)); AST_Node.warn("Declaring {name} as function [{file}:{line},{col}]", template(def.name));
var defun = make_node(AST_Defun, def, def.value); var defun = make_node(AST_Defun, def, def.value);
defun.name = make_node(AST_SymbolDefun, def.name, def.name); defun.name = make_node(AST_SymbolDefun, def.name, def.name);
var name_def = def.name.scope.resolve().def_function(defun.name); var name_def = def.name.scope.resolve().def_function(defun.name);
if (def.value.name) { if (old_def) def.value.walk(new TreeWalker(function(node) {
var old_def = def.value.name.definition(); if (node instanceof AST_SymbolRef && node.definition() === old_def) {
def.value.walk(new TreeWalker(function(node) { node.name = name_def.name;
if (node instanceof AST_SymbolRef && node.definition() === old_def) { node.thedef = name_def;
node.name = name_def.name; node.reference({});
node.thedef = name_def; }
node.reference({}); }));
}
}));
}
body.push(defun); body.push(defun);
} else { } else {
if (var_defs.length > 1 && sym.orig.indexOf(def.name) > sym.eliminated) { if (var_defs.length > 1 && sym.orig.indexOf(def.name) > sym.eliminated) {

41
test/compress/functions.js
View File

@@ -4705,3 +4705,44 @@ issue_3911: {
} }
expect_stdout: "PASS" expect_stdout: "PASS"
} }
issue_3929: {
options = {
functions: true,
reduce_vars: true,
unused: true,
}
input: {
(function() {
var abc = function f() {
(function() {
switch (f) {
default:
var abc = 0;
case 0:
abc.p;
}
console.log(typeof f);
})();
};
typeof abc && abc();
})();
}
expect: {
(function() {
var abc = function f() {
(function() {
switch (f) {
default:
var abc = 0;
case 0:
abc.p;
}
console.log(typeof f);
})();
};
typeof abc && abc();
})();
}
expect_stdout: "function"
}