fix corner cases related to AST_Hole (#3994)

This commit is contained in:
Alex Lam S.L
2020-06-13 15:24:57 +01:00
committed by GitHub
parent 3188db7b90
commit 9e881407bd
3 changed files with 60 additions and 37 deletions

View File

@@ -3369,9 +3369,10 @@ merge(Compressor.prototype, {
var elements = [];
for (var i = 0; i < this.elements.length; i++) {
var element = this.elements[i];
if (element instanceof AST_Hole) continue;
var value = element._eval(compressor, ignore_side_effects, cached, depth);
if (element === value) return this;
elements.push(value);
elements[i] = value;
}
return elements;
}
@@ -8446,7 +8447,8 @@ merge(Compressor.prototype, {
var elements = expr.elements;
var retValue = elements[index];
if (safe_to_flatten(retValue, compressor)) {
var flatten = true;
var is_hole = retValue instanceof AST_Hole;
var flatten = !is_hole;
var values = [];
for (var i = elements.length; --i > index;) {
var value = elements[i].drop_side_effect_free(compressor);
@@ -8455,12 +8457,16 @@ merge(Compressor.prototype, {
if (flatten && value.has_side_effects(compressor)) flatten = false;
}
}
retValue = retValue instanceof AST_Hole ? make_node(AST_Undefined, retValue) : retValue;
if (!flatten) values.unshift(retValue);
while (--i >= 0) {
var value = elements[i].drop_side_effect_free(compressor);
if (value) values.unshift(value);
else index--;
if (value) {
values.unshift(value);
} else if (is_hole) {
values.unshift(make_node(AST_Hole, elements[i]));
} else {
index--;
}
}
if (flatten) {
values.push(retValue);