enhance `arrows` (#4403)

1 files changed, 11 insertions, 14 deletions

diff --git a/lib/compress.js b/lib/compress.js
index ab5ad06d..a3842bed 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -4670,22 +4670,19 @@ merge(Compressor.prototype, {
 
     OPT(AST_Arrow, function(self, compressor) {
         if (!compressor.option("arrows")) return self;
-        if (self.value) {
-            var value = self.value;
-            if (is_undefined(value, compressor)) {
-                self.value = null;
-            } else if (value instanceof AST_UnaryPrefix && value.operator == "void") {
-                self.body.push(make_node(AST_SimpleStatement, value, {
-                    body: value.expression
-                }));
-                self.value = null;
-            }
-        } else if (self.body.length == 1) {
-            var stat = self.body[0];
-            if (stat instanceof AST_Return && stat.value) {
-                self.body.pop();
+        var body = tighten_body(self.value ? [ self.first_statement() ] : self.body, compressor);
+        switch (body.length) {
+          case 1:
+            var stat = body[0];
+            if (stat instanceof AST_Return) {
+                self.body.length = 0;
                 self.value = stat.value;
+                break;
             }
+          default:
+            self.body = body;
+            self.value = null;
+            break;
         }
         return self;
     });