fix corner case in functions (#4789)

fixes #4788
This commit is contained in:
Alex Lam S.L
2021-03-16 12:58:51 +00:00
committed by GitHub
parent b98ce6c84f
commit 9a9543013c
4 changed files with 50 additions and 5 deletions

View File

@@ -6279,11 +6279,15 @@ merge(Compressor.prototype, {
function can_rename(fn, name) { function can_rename(fn, name) {
if (!fn.name) return !fn.variables.get(name); if (!fn.name) return !fn.variables.get(name);
old_def = fn.name.definition(); old_def = fn.name.definition();
if (old_def.orig.length > 1) {
old_def = null;
} else {
if (old_def.assignments > 0) return false; if (old_def.assignments > 0) return false;
if (old_def.name == name) return true; if (old_def.name == name) return true;
}
if (name == "await" && is_async(fn)) return false; if (name == "await" && is_async(fn)) return false;
if (name == "yield" && is_generator(fn)) return false; if (name == "yield" && is_generator(fn)) return false;
return all(old_def.references, function(ref) { return !old_def || all(old_def.references, function(ref) {
return ref.scope.find_variable(name) === sym; return ref.scope.find_variable(name) === sym;
}); });
} }

View File

@@ -5912,3 +5912,40 @@ issue_4753_2: {
} }
expect_stdout: "PASS" expect_stdout: "PASS"
} }
issue_4788: {
options = {
evaluate: true,
functions: true,
keep_fnames: true,
reduce_vars: true,
toplevel: true,
unused: true,
}
input: {
function f() {
var a = function g() {
if (0) {
var g = 42;
f();
}
g || console.log("PASS");
};
a(a);
}
f();
}
expect: {
(function f() {
function a() {
if (0) {
var g = 42;
f();
}
g || console.log("PASS");
}
a();
})();
}
expect_stdout: "PASS"
}

View File

@@ -153,7 +153,7 @@ issue_4487: {
} }
expect: { expect: {
function a() { function a() {
var a = console.log(typeof a); var f = console.log(typeof f);
} }
a(); a();
} }

View File

@@ -1947,7 +1947,11 @@ function createTypeofExpr(recurmax, stmtDepth, canThrow) {
} }
function createValue() { function createValue() {
return VALUES[rng(VALUES.length)]; var v;
do {
v = VALUES[rng(VALUES.length)];
} while (v == "new.target" && rng(200));
return v;
} }
function createBinaryOp(noComma, canThrow) { function createBinaryOp(noComma, canThrow) {