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

fix corner cases in properties (#3189)

Browse Source 
fixes #3188
This commit is contained in:
Alex Lam S.L
2018-06-19 18:20:11 +08:00
committed by GitHub
parent 9e19e63551
commit e54ddcbb8a
2 changed files with 116 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/compress.js
View File

@@ -6171,6 +6171,16 @@ merge(Compressor.prototype, {
});
});
function safe_to_flatten(value, compressor) {
if (value instanceof AST_SymbolRef) {
value = value.fixed_value();
}
if (!value) return false;
return !(value instanceof AST_Lambda)
|| compressor.parent() instanceof AST_New
|| !value.contains_this();
}
OPT(AST_Sub, function(self, compressor) {
var expr = self.expression;
var prop = self.property;
@@ -6210,7 +6220,8 @@ merge(Compressor.prototype, {
&& prop instanceof AST_Number && expr instanceof AST_Array) {
var index = prop.getValue();
var elements = expr.elements;
if (index in elements) {
var retValue = elements[index];
if (safe_to_flatten(retValue, compressor)) {
var flatten = true;
var values = [];
for (var i = elements.length; --i > index;) {
@@ -6220,7 +6231,6 @@ merge(Compressor.prototype, {
if (flatten && value.has_side_effects(compressor)) flatten = false;
}
}
var retValue = elements[index];
retValue = retValue instanceof AST_Hole ? make_node(AST_Undefined, retValue) : retValue;
if (!flatten) values.unshift(retValue);
while (--i >= 0) {
@@ -6296,10 +6306,7 @@ merge(Compressor.prototype, {
if (!all(props, function(prop) {
return prop instanceof AST_ObjectKeyVal;
})) break;
var value = prop.value;
if (value instanceof AST_Function
&& !(compressor.parent() instanceof AST_New)
&& value.contains_this()) break;
if (!safe_to_flatten(prop.value, compressor)) break;
return make_node(AST_Sub, this, {
expression: make_node(AST_Array, expr, {
elements: props.map(function(prop) {