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

fix corner case in inline (#4660)

Browse Source 
fixes #4659
This commit is contained in:
Alex Lam S.L
2021-02-18 08:15:44 +00:00
committed by GitHub
parent 6a2bda52f3
commit a7bcd4d613
3 changed files with 133 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/compress.js
View File

@@ -5964,7 +5964,7 @@ merge(Compressor.prototype, {
if (old_def) old_def.forEach(function(node) {
node.name = name_def.name;
node.thedef = name_def;
node.reference({});
node.reference();
});
body.push(defun);
} else {
@@ -6798,7 +6798,7 @@ merge(Compressor.prototype, {
scope: self,
thedef: decl.definition()
});
sym.reference({});
sym.reference();
assignments.push(make_node(AST_Assign, node, {
operator: "=",
left: sym,
@@ -6845,7 +6845,7 @@ merge(Compressor.prototype, {
scope: node.expression.scope,
thedef: def
});
sym.reference({});
sym.reference();
return sym;
}
if (node instanceof AST_Unary) {
@@ -8469,12 +8469,12 @@ merge(Compressor.prototype, {
node = maintain_this_binding(compressor, parent, current, node);
if (replacing || best_of_expression(node, self) === node) {
refs.forEach(function(ref) {
var def = ref.definition();
def.references.push(ref);
ref.scope = exp === fn ? fn.parent_scope : exp.scope;
ref.reference();
if (replacing) {
def.replaced++;
ref.definition().replaced++;
} else {
def.single_use = false;
ref.definition().single_use = false;
}
});
return node;
@@ -10853,7 +10853,7 @@ merge(Compressor.prototype, {
}, fn.argnames) === argname) {
def.reassigned = false;
var sym = make_node(AST_SymbolRef, self, argname);
sym.reference({});
sym.reference();
delete argname.__unused;
return sym;
}

4
lib/scope.js
View File

@@ -433,7 +433,9 @@ AST_Symbol.DEFMETHOD("mark_enclosed", function(options) {
var def = this.definition();
for (var s = this.scope; s; s = s.parent_scope) {
push_uniq(s.enclosed, def);
if (options.keep_fnames) {
if (!options) {
delete s._var_names;
} else if (options.keep_fnames) {
s.functions.each(function(d) {
push_uniq(def.scope.enclosed, d);
});

122
test/compress/functions.js
View File

@@ -5436,3 +5436,125 @@ issue_4655: {
}
expect_stdout: "PASS"
}
issue_4659_1: {
options = {
inline: true,
reduce_vars: true,
}
input: {
var a = 0;
(function() {
function f() {
return a++;
}
(function() {
f && f();
(function() {
var a = console && a;
})();
})();
})();
console.log(a);
}
expect: {
var a = 0;
(function() {
function f() {
return a++;
}
(function() {
f && a++;
(function() {
var a = console && a;
})();
})();
})();
console.log(a);
}
expect_stdout: "1"
}
issue_4659_2: {
options = {
inline: true,
reduce_vars: true,
}
input: {
var a = 0;
(function() {
function f() {
return a++;
}
(function() {
(function() {
f && f();
})();
(function() {
var a = console && a;
})();
})();
})();
console.log(a);
}
expect: {
var a = 0;
(function() {
function f() {
return a++;
}
(function() {
void (f && a++);
(function() {
var a = console && a;
})();
})();
})();
console.log(a);
}
expect_stdout: "1"
}
issue_4659_3: {
options = {
inline: true,
reduce_vars: true,
unused: true,
}
input: {
var a = 0;
(function() {
function f() {
return a++;
}
(function() {
function g() {
while (!console);
}
g(f && f());
(function() {
var a = console && a;
})();
})();
})();
console.log(a);
}
expect: {
var a = 0;
(function() {
function f() {
return a++;
}
(function() {
(function() {
while (!console);
})(f && a++);
(function() {
var a = console && a;
})();
})();
})();
console.log(a);
}
expect_stdout: "1"
}