From 7d6907cb99bac1e835febe30494ebca4c1a671d3 Mon Sep 17 00:00:00 2001 From: "Alex Lam S.L" Date: Fri, 15 Dec 2017 19:41:28 +0800 Subject: fix `dead_code` on nested `try` (#2599) fixes #2597 --- lib/compress.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'lib/compress.js') diff --git a/lib/compress.js b/lib/compress.js index 0162fa4e..a8bcf54f 100644 --- a/lib/compress.js +++ b/lib/compress.js @@ -4751,11 +4751,7 @@ merge(Compressor.prototype, { node = parent; parent = compressor.parent(level++); if (parent instanceof AST_Exit) { - var try_node = find_try(level); - if (try_node) { - if (try_node.bfinally) break; - if (parent instanceof AST_Throw && try_node.bcatch) break; - } + if (in_try(level, parent instanceof AST_Throw)) break; if (self.operator == "=") return self.right; return make_node(AST_Binary, self, { operator: self.operator.slice(0, -1), @@ -4787,11 +4783,14 @@ merge(Compressor.prototype, { } return self; - function find_try(level) { + function in_try(level, no_catch) { var scope = self.left.definition().scope; var parent; while ((parent = compressor.parent(level++)) !== scope) { - if (parent instanceof AST_Try) return parent; + if (parent instanceof AST_Try) { + if (parent.bfinally) return true; + if (no_catch && parent.bcatch) return true; + } } } }); -- cgit v1.2.3