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

Merge branch 'master' into harmony-v3.3.4

Browse Source
This commit is contained in:
alexlamsl
2017-12-31 00:05:32 +08:00
parent ace272f0c5 e2ec270b04
commit 3bbe839518
4 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/compress.js
View File

@@ -5148,7 +5148,7 @@ merge(Compressor.prototype, {
return self;
});
function is_reachable(node, defs) {
function is_reachable(self, defs) {
var reachable = false;
var find_ref = new TreeWalker(function(node) {
if (reachable) return true;
@@ -5158,7 +5158,7 @@ merge(Compressor.prototype, {
});
var scan_scope = new TreeWalker(function(node) {
if (reachable) return true;
if (node instanceof AST_Scope) {
if (node instanceof AST_Scope && node !== self) {
var parent = scan_scope.parent();
if (!(parent instanceof AST_Call && parent.expression === node)) {
node.walk(find_ref);
@@ -5166,7 +5166,7 @@ merge(Compressor.prototype, {
return true;
}
});
node.walk(scan_scope);
self.walk(scan_scope);
return reachable;
}
@@ -5183,7 +5183,7 @@ merge(Compressor.prototype, {
parent = compressor.parent(level++);
if (parent instanceof AST_Exit) {
if (in_try(level, parent instanceof AST_Throw)) break;
if (is_reachable(self, [ def ])) break;
if (is_reachable(def.scope, [ def ])) break;
if (self.operator == "=") return self.right;
return make_node(AST_Binary, self, {
operator: self.operator.slice(0, -1),

4
lib/output.js
View File

@@ -699,9 +699,7 @@ function OutputStream(options) {
}
};
PARENS(AST_Node, function(){
return false;
});
PARENS(AST_Node, return_false);
// a function expression needs parens around it when it's provably
// the first token to appear in a statement.