Merge branch 'master' into harmony-v3.0.16

2017-06-14 17:09:30 +08:00
parent 68138f2281 4231f7323e
commit 8af362ed57
35 changed files with 1155 additions and 208 deletions
--- a/lib/propmangle.js
+++ b/lib/propmangle.js
@@ -96,7 +96,8 @@ function mangle_properties(ast, options) {
        reserved: null,
    });

-    var reserved = options.reserved || [];
+    var reserved = options.reserved;
+    if (!Array.isArray(reserved)) reserved = [];
    if (!options.builtins) find_builtins(reserved);

    var cache = options.cache;