fix corner case in templates (#4677)

fixes #4676
This commit is contained in:
Alex Lam S.L
2021-02-22 15:59:28 +00:00
committed by GitHub
parent f9a2a9d78e
commit e535f19189
2 changed files with 38 additions and 2 deletions

View File

@@ -10141,8 +10141,9 @@ merge(Compressor.prototype, {
OPT(AST_Template, function(self, compressor) { OPT(AST_Template, function(self, compressor) {
if (!compressor.option("templates")) return self; if (!compressor.option("templates")) return self;
if (!self.tag || is_raw_tag(compressor, self.tag)) { if (!self.tag || is_raw_tag(compressor, self.tag)) {
var exprs = self.expressions; var exprs = self.expressions.slice();
var strs = self.strings; var strs = self.strings.slice();
var CHANGED = false;
for (var i = exprs.length; --i >= 0;) { for (var i = exprs.length; --i >= 0;) {
var node = exprs[i]; var node = exprs[i];
var ev = node.evaluate(compressor); var ev = node.evaluate(compressor);
@@ -10163,6 +10164,11 @@ merge(Compressor.prototype, {
}).evaluate(compressor)) continue; }).evaluate(compressor)) continue;
exprs.splice(i, 1); exprs.splice(i, 1);
strs.splice(i, 2, combined); strs.splice(i, 2, combined);
CHANGED = true;
}
if (CHANGED) {
self.expressions = exprs;
self.strings = strs;
} }
} }
return try_evaluate(compressor, self); return try_evaluate(compressor, self);

View File

@@ -298,3 +298,33 @@ issue_4630: {
expect_stdout: "/PASS/" expect_stdout: "/PASS/"
node_version: ">=4" node_version: ">=4"
} }
issue_4676: {
options = {
evaluate: true,
reduce_vars: true,
templates: true,
toplevel: true,
unsafe:true,
unused: true,
}
input: {
function f(a) {
var b = `foo${a = "PASS"}`;
for (var c in f && b)
b.p;
return a;
}
console.log(f("FAIL"));
}
expect: {
console.log(function f(a) {
var b = "fooPASS";
for (var c in f, b)
b.p;
return "PASS";
}());
}
expect_stdout: "PASS"
node_version: ">=4"
}