extend escape analysis on constant expression properties (#2509)
fixes #2508
This commit is contained in:
@@ -333,7 +333,7 @@ merge(Compressor.prototype, {
|
||||
}
|
||||
}
|
||||
}
|
||||
mark_escaped(d, node, value, 0);
|
||||
mark_escaped(d, node.scope, node, value, 0);
|
||||
}
|
||||
if (node instanceof AST_SymbolCatch) {
|
||||
node.definition().fixed = false;
|
||||
@@ -623,10 +623,12 @@ merge(Compressor.prototype, {
|
||||
}
|
||||
}
|
||||
|
||||
function mark_escaped(d, node, value, level) {
|
||||
function mark_escaped(d, scope, node, value, level) {
|
||||
var parent = tw.parent(level);
|
||||
if (value instanceof AST_Constant) return;
|
||||
if (level > 0 && value instanceof AST_Function) return;
|
||||
if (value) {
|
||||
if (value.is_constant()) return;
|
||||
if (level > 0 && value.is_constant_expression(scope)) return;
|
||||
}
|
||||
if (parent instanceof AST_Assign && parent.operator == "=" && node === parent.right
|
||||
|| parent instanceof AST_Call && node !== parent.expression
|
||||
|| parent instanceof AST_Return && node === parent.value && node.scope !== d.scope
|
||||
@@ -634,13 +636,13 @@ merge(Compressor.prototype, {
|
||||
d.escaped = true;
|
||||
return;
|
||||
} else if (parent instanceof AST_Array) {
|
||||
mark_escaped(d, parent, parent, level + 1);
|
||||
mark_escaped(d, scope, parent, parent, level + 1);
|
||||
} else if (parent instanceof AST_ObjectKeyVal && node === parent.value) {
|
||||
var obj = tw.parent(level + 1);
|
||||
mark_escaped(d, obj, obj, level + 2);
|
||||
mark_escaped(d, scope, obj, obj, level + 2);
|
||||
} else if (parent instanceof AST_PropAccess && node === parent.expression) {
|
||||
value = read_property(value, parent.property);
|
||||
mark_escaped(d, parent, value, level + 1);
|
||||
mark_escaped(d, scope, parent, value, level + 1);
|
||||
if (value) return;
|
||||
}
|
||||
if (level == 0) d.direct_access = true;
|
||||
|
||||
Reference in New Issue
Block a user