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

fix corner case in awaits (#4740)

Browse Source 
fixes #4738
This commit is contained in:
Alex Lam S.L
2021-03-05 20:25:44 +00:00
committed by GitHub
parent fa09f87589
commit 83c3838b07
2 changed files with 125 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/compress.js
View File

@@ -7205,10 +7205,10 @@ merge(Compressor.prototype, {
});
def(AST_Await, function(compressor) {
if (!compressor.option("awaits")) return this;
var exp = this.expression.drop_side_effect_free(compressor);
if (exp === this.expression) return this;
var exp = this.expression;
if (!is_primitive(compressor, exp)) return this;
var node = this.clone();
node.expression = exp || make_node(AST_Number, this, { value: 0 });
node.expression = exp.drop_side_effect_free(compressor) || make_node(AST_Number, this, { value: 0 });
return node;
});
def(AST_Binary, function(compressor, first_in_statement) {
@@ -9555,6 +9555,25 @@ merge(Compressor.prototype, {
|| node instanceof AST_Object;
}
function is_primitive(compressor, node) {
if (node.is_constant()) return true;
if (node instanceof AST_Assign) return node.operator != "=" || is_primitive(compressor, node.right);
if (node instanceof AST_Binary) {
return !lazy_op[node.operator]
|| is_primitive(compressor, node.left) && is_primitive(compressor, node.right);
}
if (node instanceof AST_Conditional) {
return is_primitive(compressor, node.consequent) && is_primitive(compressor, node.alternative);
}
if (node instanceof AST_Sequence) return is_primitive(compressor, node.tail_node());
if (node instanceof AST_SymbolRef) {
var fixed = node.fixed_value();
return fixed && is_primitive(compressor, fixed);
}
if (node instanceof AST_Template) return !node.tag || is_raw_tag(compressor, node.tag);
if (node instanceof AST_Unary) return true;
}
function repeatable(compressor, node) {
if (node instanceof AST_Dot) return repeatable(compressor, node.expression);
if (node instanceof AST_Sub) {

103
test/compress/awaits.js
View File

@@ -23,16 +23,34 @@ async_label: {
}
await_await: {
options = {
awaits: true,
side_effects: true,
}
input: {
(async function() {
await await {
then(resolve) {
resolve({
then() {
console.log("PASS");
await await 42;
},
});
},
};
})();
}
expect: {
(async function() {
await {
then(resolve) {
resolve({
then() {
console.log("PASS");
await await 42;
},
});
},
};
})();
}
expect_stdout: "PASS"
@@ -1280,3 +1298,84 @@ issue_4717: {
expect_stdout: "PASS"
node_version: ">=8"
}
issue_4738_1: {
options = {
awaits: true,
side_effects: true,
}
input: {
(async function() {
await {
then() {
console.log("PASS");
},
};
})();
}
expect: {
(async function() {
await {
then() {
console.log("PASS");
},
};
})();
}
expect_stdout: "PASS"
node_version: ">=8"
}
issue_4738_2: {
options = {
awaits: true,
side_effects: true,
}
input: {
(async function() {
await {
get then() {
console.log("PASS");
},
};
})();
}
expect: {
(async function() {
await {
get then() {
console.log("PASS");
},
};
})();
}
expect_stdout: "PASS"
node_version: ">=8"
}
issue_4738_3: {
options = {
awaits: true,
side_effects: true,
}
input: {
(async function() {
await {
then: function() {
console.log("PASS");
},
};
})();
}
expect: {
(async function() {
await {
then: function() {
console.log("PASS");
},
};
})();
}
expect_stdout: "PASS"
node_version: ">=8"
}