var NO_MERGE = makePredicate("arguments await yield");
AST_Scope.DEFMETHOD("merge_variables", function(compressor) {
if (!compressor.option("merge_vars")) return;
- var self = this, segment = {}, root;
+ var in_try, root, segment = {}, self = this;
var first = [], last = [], index = 0;
var declarations = new Dictionary();
var references = Object.create(null);
return true;
}
if (node instanceof AST_Try) {
- push();
- segment.block = node;
+ var save_try = in_try;
+ in_try = node;
+ var save = segment;
walk_body(node, tw);
- pop();
+ segment = save;
if (node.bcatch) {
if (node.bcatch.argname) node.bcatch.argname.mark_symbol(function(node) {
if (node instanceof AST_SymbolCatch) {
if (def = def.redefined()) references[def.id] = false;
}
}, tw);
- push();
- if (node.bfinally) segment.block = node.bcatch;
- walk_body(node.bcatch, tw);
- pop();
+ if (node.bfinally || (in_try = save_try)) {
+ walk_body(node.bcatch, tw);
+ } else {
+ push();
+ walk_body(node.bcatch, tw);
+ pop();
+ }
}
+ in_try = save_try;
+ segment = save;
if (node.bfinally) node.bfinally.walk(tw);
return true;
}
}
function mark(sym, read) {
+ if (in_try) push();
var def = sym.definition(), ldef;
if (def.id in references) {
var refs = references[def.id];
try {
console.log("PASS");
} catch (e) {
- var b = a;
+ var c = a;
} finally {
- var c = b;
+ var c = c;
}
console.log(c);
}
"0",
]
}
+
+issue_4759: {
+ options = {
+ merge_vars: true,
+ toplevel: true,
+ }
+ input: {
+ var i = 2, a = 1, b, c, d;
+ while (i--) {
+ try {
+ if (1 != b) {
+ d = [];
+ null.p;
+ c = d;
+ } else {
+ b = 0;
+ a = c;
+ }
+ } catch (e) {}
+ b = a;
+ }
+ console.log(a);
+ }
+ expect: {
+ var i = 2, a = 1, b, c, d;
+ while (i--) {
+ try {
+ if (1 != b) {
+ d = [];
+ null.p;
+ c = d;
+ } else {
+ b = 0;
+ a = c;
+ }
+ } catch (e) {}
+ b = a;
+ }
+ console.log(a);
+ }
+ expect_stdout: "undefined"
+}