Merge branch 'master' into harmony

2017-03-31 12:54:03 +08:00
parent 5dea52266b a84564d1a8
commit d717bf9ce8
21 changed files with 495 additions and 145 deletions
--- a/test/compress/dead-code.js
+++ b/test/compress/dead-code.js
@@ -236,3 +236,45 @@ dead_code_const_annotation_complex_scope: {
    }
    expect_stdout: true
 }
+
+try_catch_finally: {
+    options = {
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+    }
+    input: {
+        var a = 1;
+        !function() {
+            try {
+                if (false) throw x;
+            } catch (a) {
+                var a = 2;
+                console.log("FAIL");
+            } finally {
+                a = 3;
+                console.log("PASS");
+            }
+        }();
+        try {
+            console.log(a);
+        } finally {
+        }
+    }
+    expect: {
+        var a = 1;
+        !function() {
+            var a;
+            a = 3;
+            console.log("PASS");
+        }();
+        try {
+            console.log(a);
+        } finally {
+        }
+    }
+    expect_stdout: [
+        "PASS",
+        "1",
+    ]
+}