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

fix corner case in inline (#2720)

Browse Source
This commit is contained in:
Alex Lam S.L
2018-01-04 23:38:37 +08:00
committed by GitHub
parent 6f3f21233f
commit 484e484571
2 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/compress.js
View File

@@ -4184,16 +4184,18 @@ merge(Compressor.prototype, {
function append_var(decls, expressions, name, value) { function append_var(decls, expressions, name, value) {
var def = name.definition(); var def = name.definition();
scope.var_names()[name.name] = true;
scope.variables.set(name.name, def); scope.variables.set(name.name, def);
scope.enclosed.push(def); scope.enclosed.push(def);
decls.unshift(make_node(AST_VarDef, name, { if (!scope.var_names()[name.name]) {
name: name, scope.var_names()[name.name] = true;
value: null decls.push(make_node(AST_VarDef, name, {
})); name: name,
value: null
}));
}
var sym = make_node(AST_SymbolRef, name, name); var sym = make_node(AST_SymbolRef, name, name);
def.references.push(sym); def.references.push(sym);
if (value) expressions.unshift(make_node(AST_Assign, self, { if (value) expressions.push(make_node(AST_Assign, self, {
operator: "=", operator: "=",
left: sym, left: sym,
right: value right: value
@@ -4203,13 +4205,13 @@ merge(Compressor.prototype, {
function flatten_args(decls, expressions) { function flatten_args(decls, expressions) {
var len = fn.argnames.length; var len = fn.argnames.length;
for (var i = self.args.length; --i >= len;) { for (var i = self.args.length; --i >= len;) {
expressions.unshift(self.args[i]); expressions.push(self.args[i]);
} }
for (i = len; --i >= 0;) { for (i = len; --i >= 0;) {
var name = fn.argnames[i]; var name = fn.argnames[i];
var value = self.args[i]; var value = self.args[i];
if (name.__unused || scope.var_names()[name.name]) { if (name.__unused || scope.var_names()[name.name]) {
if (value) expressions.unshift(value); if (value) expressions.push(value);
} else { } else {
var symbol = make_node(AST_SymbolVar, name, name); var symbol = make_node(AST_SymbolVar, name, name);
name.definition().orig.push(symbol); name.definition().orig.push(symbol);
@@ -4217,14 +4219,16 @@ merge(Compressor.prototype, {
append_var(decls, expressions, symbol, value); append_var(decls, expressions, symbol, value);
} }
} }
decls.reverse();
expressions.reverse();
} }
function flatten_vars(decls, expressions) { function flatten_vars(decls, expressions) {
if (in_loop) in_loop.length = 0; var pos = expressions.length;
for (var i = fn.body.length; --i >= 0;) { for (var i = 0, lines = fn.body.length; i < lines; i++) {
var stat = fn.body[i]; var stat = fn.body[i];
if (!(stat instanceof AST_Var)) continue; if (!(stat instanceof AST_Var)) continue;
for (var j = stat.definitions.length; --j >= 0;) { for (var j = 0, defs = stat.definitions.length; j < defs; j++) {
var var_def = stat.definitions[j]; var var_def = stat.definitions[j];
var name = var_def.name; var name = var_def.name;
append_var(decls, expressions, name, var_def.value); append_var(decls, expressions, name, var_def.value);
@@ -4232,7 +4236,7 @@ merge(Compressor.prototype, {
var def = name.definition(); var def = name.definition();
var sym = make_node(AST_SymbolRef, name, name); var sym = make_node(AST_SymbolRef, name, name);
def.references.push(sym); def.references.push(sym);
in_loop.unshift(make_node(AST_Assign, var_def, { expressions.splice(pos++, 0, make_node(AST_Assign, var_def, {
operator: "=", operator: "=",
left: sym, left: sym,
right: make_node(AST_Undefined, name) right: make_node(AST_Undefined, name)
@@ -4240,14 +4244,13 @@ merge(Compressor.prototype, {
} }
} }
} }
if (in_loop) [].unshift.apply(expressions, in_loop);
} }
function flatten_fn() { function flatten_fn() {
var decls = []; var decls = [];
var expressions = []; var expressions = [];
flatten_vars(decls, expressions);
flatten_args(decls, expressions); flatten_args(decls, expressions);
flatten_vars(decls, expressions);
expressions.push(value); expressions.push(value);
if (decls.length) { if (decls.length) {
i = scope.body.indexOf(compressor.parent(level - 1)) + 1; i = scope.body.indexOf(compressor.parent(level - 1)) + 1;

18
test/compress/functions.js
View File

@@ -1887,3 +1887,21 @@ use_before_init_in_loop: {
} }
expect_stdout: "PASS" expect_stdout: "PASS"
} }
duplicate_arg_var: {
options = {
inline: true,
toplevel: true,
}
input: {
console.log(function(b) {
return b;
var b;
}("PASS"));
}
expect: {
console.log((b = "PASS", b));
var b;
}
expect_stdout: "PASS"
}