diff options
-rw-r--r-- | lib/compress.js | 6 | ||||
-rw-r--r-- | test/compress.js | 3 | ||||
-rw-r--r-- | test/compress/hoist_props.js | 32 |
3 files changed, 39 insertions, 2 deletions
diff --git a/lib/compress.js b/lib/compress.js index 4f5e9253..5509137b 100644 --- a/lib/compress.js +++ b/lib/compress.js @@ -4931,7 +4931,11 @@ merge(Compressor.prototype, { if (def.single_use) return; if (top_retain(def)) return; if (sym.fixed_value() !== right) return; - return right instanceof AST_Object && right.properties.length > 0; + return right instanceof AST_Object + && right.properties.length > 0 + && all(right.properties, function(prop) { + return prop instanceof AST_ObjectKeyVal; + }); } }); diff --git a/test/compress.js b/test/compress.js index 8a6dd228..2fe02806 100644 --- a/test/compress.js +++ b/test/compress.js @@ -14,7 +14,6 @@ var file = process.argv[2]; var dir = path.resolve(path.dirname(module.filename), "compress"); if (file) { var minify_options = require("./ufuzz/options.json").map(JSON.stringify); - U.AST_Node.enable_validation(); log("--- {file}", { file: file }); var tests = parse_test(path.resolve(dir, file)); process.exit(Object.keys(tests).filter(function(name) { @@ -189,6 +188,7 @@ function reminify(orig_options, input_code, input_formatted, stdout) { } }); var options_formatted = JSON.stringify(options, null, 4); + options.validate = true; var result = U.minify(input_code, options); if (result.error) { log([ @@ -252,6 +252,7 @@ function run_code(code, toplevel) { function test_case(test) { log(" Running test [{name}]", { name: test.name }); + U.AST_Node.enable_validation(); var output_options = test.beautify || {}; var expect; if (test.expect) { diff --git a/test/compress/hoist_props.js b/test/compress/hoist_props.js index cc7ef020..a73df1f5 100644 --- a/test/compress/hoist_props.js +++ b/test/compress/hoist_props.js @@ -940,3 +940,35 @@ issue_3868: { } expect_stdout: "PASS" } + +issue_3871: { + options = { + hoist_props: true, + reduce_vars: true, + } + input: { + console.log(function() { + do { + var b = { + get null() { + c; + } + }; + } while (!b); + return "PASS"; + }()); + } + expect: { + console.log(function() { + do { + var b = { + get null() { + c; + } + }; + } while (!b); + return "PASS"; + }()); + } + expect_stdout: "PASS" +} |