Merge branch 'master' into harmony-v2.8.6

This commit is contained in:
alexlamsl
2017-03-05 21:42:34 +08:00
3 changed files with 23 additions and 5 deletions

View File

@@ -2970,7 +2970,7 @@ merge(Compressor.prototype, {
if (self.car instanceof AST_Assign
&& !self.car.left.has_side_effects(compressor)) {
left = self.car.left;
} else if (self.car instanceof AST_UnaryPostfix
} else if (self.car instanceof AST_Unary
&& (self.car.operator == "++" || self.car.operator == "--")) {
left = self.car.expression;
}
@@ -2979,11 +2979,15 @@ merge(Compressor.prototype, {
var cdr = self.cdr;
while (true) {
if (cdr.equivalent_to(left)) {
var car = self.car instanceof AST_UnaryPostfix ? make_node(AST_UnaryPrefix, self.car, {
operator: self.car.operator,
expression: left
}) : self.car;
if (parent) {
parent[field] = self.car;
parent[field] = car;
return self.cdr;
}
return self.car;
return car;
}
if (cdr instanceof AST_Binary && !(cdr instanceof AST_Assign)) {
field = cdr.left.is_constant() ? "right" : "left";