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

fix corner cases in inline (#5255)

Browse Source 
fixes #5254
This commit is contained in:
Alex Lam S.L
2022-01-02 13:24:41 +00:00
committed by GitHub
parent f7841bc8b8
commit 7889192cae
4 changed files with 204 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/compress.js
View File

@@ -10317,7 +10317,7 @@ Compressor.prototype.compress = function(node) {
function flatten_vars(decls, expressions) {
var args = [ insert, 0 ];
var decl_var = [], expr_var = [], expr_loop = [], exprs = [];
var decl_var = [], expr_fn = [], expr_var = [], expr_loop = [], exprs = [];
fn.body.filter(in_loop ? function(stat) {
if (!(stat instanceof AST_LambdaDefinition)) return true;
var name = make_node(AST_SymbolVar, stat.name, flatten_var(stat.name));
@@ -10325,7 +10325,7 @@ Compressor.prototype.compress = function(node) {
def.fixed = false;
def.orig.push(name);
def.eliminated++;
append_var(decls, expressions, name, to_func_expr(stat, true));
append_var(decls, expr_fn, name, to_func_expr(stat, true));
return false;
} : function(stat) {
if (!(stat instanceof AST_LambdaDefinition)) return true;
@@ -10351,7 +10351,10 @@ Compressor.prototype.compress = function(node) {
exprs = [];
}
append_var(decl_var, expr_var, name, value);
if (in_loop && !arg_used.has(name.name) && !fn.functions.has(name.name)) {
if (!in_loop) continue;
if (arg_used.has(name.name)) continue;
var def = fn.variables.get(name.name);
if (fn.functions.has(name.name) && def.orig.length == 1) continue;
var def = fn.variables.get(name.name);
var sym = make_node(AST_SymbolRef, name, name);
def.references.push(sym);
@@ -10361,10 +10364,10 @@ Compressor.prototype.compress = function(node) {
right: make_node(AST_Undefined, name),
}));
}
}
});
[].push.apply(decls, decl_var);
[].push.apply(expressions, expr_loop);
[].push.apply(expressions, expr_fn);
[].push.apply(expressions, expr_var);
return args;
}
@@ -12986,12 +12989,17 @@ Compressor.prototype.compress = function(node) {
scope.enclosed.push(def);
scope.variables.set(name, def);
def.single_use = false;
if (!in_loop || fn.functions.has(name)) return;
if (!in_loop) return;
if (fn.functions.has(name) && def.orig.length == 1) return;
if (def.references.length == def.replaced) return;
var sym = flatten_var(def.orig[0]);
if (sym.TYPE != "SymbolVar") return;
var ref = make_node(AST_SymbolRef, sym, sym);
sym.definition().references.push(ref);
if (!all(def.orig, function(sym) {
return !(sym instanceof AST_SymbolConst
|| sym instanceof AST_SymbolFunarg
|| sym instanceof AST_SymbolLet);
})) return;
var sym = def.orig[0];
var ref = make_node(AST_SymbolRef, sym, flatten_var(sym));
ref.definition().references.push(ref);
body.push(make_node(AST_SimpleStatement, sym, {
body: make_node(AST_Assign, sym, {
operator: "=",

25
test/compress/const.js
View File

@@ -1727,3 +1727,28 @@ issue_4965_2: {
expect_stdout: "undefined"
node_version: ">=4"
}
issue_5254: {
options = {
inline: true,
toplevel: true,
}
input: {
do {
(function() {
const a = console.log;
a && a("foo");
})();
} while (console.log("bar"));
}
expect: {
do {
const a = console.log;
a && a("foo");
} while (console.log("bar"));
}
expect_stdout: [
"foo",
"bar",
]
}

127
test/compress/functions.js
View File

@@ -944,6 +944,7 @@ inline_loop_5: {
}
expect: {
for (var a in "foo")
f = void 0,
f = function() {},
void console.log(typeof f, a - f);
var f;
@@ -971,6 +972,7 @@ inline_loop_6: {
}
expect: {
for (var a in "foo")
f = void 0,
f = function() {},
void console.log(typeof f, a - f);
var f;
@@ -983,6 +985,64 @@ inline_loop_6: {
}
inline_loop_7: {
options = {
inline: true,
toplevel: true,
}
input: {
for (var a in "foo") {
(function() {
function f() {}
var f;
while (console.log(typeof f, a - f));
})();
}
}
expect: {
for (var a in "foo") {
f = void 0;
var f = function() {};
var f;
while (console.log(typeof f, a - f));
}
}
expect_stdout: [
"function NaN",
"function NaN",
"function NaN",
]
}
inline_loop_8: {
options = {
inline: true,
toplevel: true,
}
input: {
for (var a in "foo") {
(function() {
var f;
function f() {}
while (console.log(typeof f, a - f));
})();
}
}
expect: {
for (var a in "foo") {
f = void 0;
var f = function() {};
var f;
while (console.log(typeof f, a - f));
}
}
expect_stdout: [
"function NaN",
"function NaN",
"function NaN",
]
}
inline_loop_9: {
options = {
inline: true,
toplevel: true,
@@ -6797,10 +6857,10 @@ issue_4753_2: {
}
expect: {
do {
a = void 0,
f = function() {
return "PASS";
},
a = void 0,
a = f(),
console.log(a);
} while (0);
@@ -7750,3 +7810,68 @@ issue_5249_2: {
}
expect_stdout: "undefined"
}
issue_5254_1: {
options = {
inline: 3,
unused: true,
}
input: {
(function(a) {
while (a--)
(function f() {
var f = new function() {
console.log(f);
}();
})();
})(2);
}
expect: {
(function(a) {
while (a--)
f = void 0,
f = new function() {
console.log(f);
}(),
void 0;
var f;
})(2);
}
expect_stdout: [
"undefined",
"undefined",
]
}
issue_5254_2: {
options = {
inline: true,
unused: true,
}
input: {
(function(a) {
while (a--)
(function f() {
var f = new function() {
console.log(f);
}();
while (!console);
})();
})(2);
}
expect: {
(function(a) {
while (a--) {
f = void 0;
var f = new function() {
console.log(f);
}();
while (!console);
}
})(2);
}
expect_stdout: [
"undefined",
"undefined",
]
}

28
test/compress/let.js
View File

@@ -1878,3 +1878,31 @@ issue_5240: {
]
node_version: ">=4"
}
issue_5254: {
options = {
inline: true,
toplevel: true,
}
input: {
"use strict";
do {
(function() {
let a = console.log;
a && a("foo");
})();
} while (console.log("bar"));
}
expect: {
"use strict";
do {
let a = console.log;
a && a("foo");
} while (console.log("bar"));
}
expect_stdout: [
"foo",
"bar",
]
node_version: ">=4"
}