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/scope.js
+++ b/lib/scope.js
@@ -450,7 +450,7 @@ AST_Symbol.DEFMETHOD("global", function(){
 });

 AST_Toplevel.DEFMETHOD("_default_mangler_options", function(options){
-    return defaults(options, {
+    options = defaults(options, {
        eval        : false,
        ie8         : false,
        keep_classnames: false,
@@ -458,6 +458,8 @@ AST_Toplevel.DEFMETHOD("_default_mangler_options", function(options){
        reserved    : [],
        toplevel    : false,
    });
+    if (!Array.isArray(options.reserved)) options.reserved = [];
+    return options;
 });

 AST_Toplevel.DEFMETHOD("mangle_names", function(options){