Merge branch 'master' into harmony-v3.0.20

2017-06-25 16:02:46 +08:00
parent 49f3de8397 8b4dcd8f3e
commit 11afa816e3
25 changed files with 472 additions and 257 deletions
--- a/test/compress/object.js
+++ b/test/compress/object.js
@@ -105,7 +105,7 @@ getter_setter_mangler: {
            };
        }
    }
-    expect_exact: "function f(n,t){return{get:n,set:t,get g(){},set s(n){},c,a:1,m(){}}}"
+    expect_exact: "function f(t,e){return{get:t,set:e,get g(){},set s(t){},c,a:1,m(){}}}"
 }

 use_shorthand_opportunity: {
@@ -297,7 +297,7 @@ concise_methods_and_mangle_props: {
    expect: {
        function x() {
            obj = {
-                a() { return 1; }
+                o() { return 1; }
            }
        }
    }