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

correctly determine scope of AST_This (#2109)

Browse Source 
fixes #2107
This commit is contained in:
Alex Lam S.L
2017-06-16 14:54:46 +08:00
committed by GitHub
parent 33405bb24b
commit 11e63bc335
2 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/compress.js
View File

@@ -3207,18 +3207,21 @@ merge(Compressor.prototype, {
if (body.length == 1 && body[0] instanceof AST_Return) {
value = body[0].value;
if (!value) return make_node(AST_Undefined, self);
value.walk(new TreeWalker(function(node) {
var tw = new TreeWalker(function(node) {
if (value === self) return true;
if (node instanceof AST_SymbolRef && matches(node.scope.find_variable(node))
|| node instanceof AST_This && matches(node)) {
if (node instanceof AST_SymbolRef) {
var ref = node.scope.find_variable(node);
if (ref && ref.scope.parent_scope === fn.parent_scope) {
value = self;
return true;
}
}
if (node instanceof AST_This && !tw.find_parent(AST_Scope)) {
value = self;
return true;
}
function matches(ref) {
return ref && ref.scope.parent_scope === fn.parent_scope;
}
}));
});
value.walk(tw);
if (value !== self) value = best_of(compressor, value, self);
} else {
value = self;