Merge branch 'master' into harmony-v3.0.17

2017-06-15 19:01:36 +08:00
parent 100e18305d 57dc4fb32f
commit 78cf35f89c
7 changed files with 90 additions and 8 deletions
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -3383,10 +3383,15 @@ merge(Compressor.prototype, {
                        if (!value) return make_node(AST_Undefined, self);
                        value.walk(new TreeWalker(function(node) {
                            if (value === self) return true;
-                            if (node instanceof AST_SymbolRef && exp.variables.has(node.name)) {
+                            if (node instanceof AST_SymbolRef && matches(node.scope.find_variable(node))
+                                || node instanceof AST_This && matches(node)) {
                                value = self;
                                return true;
                            }
+
+                            function matches(ref) {
+                                return ref && ref.scope.parent_scope === fn.parent_scope;
+                            }
                        }));
                        if (value !== self) value = best_of(compressor, value, self);
                    } else {