Update new option to --exclude-pagezero.

Address code review comments.

Author: rjmansfield

llvm/test/tools/llvm-size/macho-pagezero.test

@@ -1,18 +1,16 @@
-# Test the -z option to skip __PAGEZERO segment in Mach-O files
+## Test the --exclude-pagezero option to skip __PAGEZERO segment in Mach-O files.
 
 # RUN: yaml2obj %s --docnum=1 -o %t-pagezero.o
 # RUN: llvm-size %t-pagezero.o | \
-# RUN:   FileCheck %s --check-prefix=NORMAL --match-full-lines \
-# RUN:                --strict-whitespace --implicit-check-not={{.}}
-# RUN: llvm-size -z %t-pagezero.o | \
-# RUN:   FileCheck %s --check-prefix=SKIP --match-full-lines \
-# RUN:                --strict-whitespace --implicit-check-not={{.}}
+# RUN:   FileCheck %s --check-prefix=NORMAL --match-full-lines
+# RUN: llvm-size --exclude-pagezero %t-pagezero.o | \
+# RUN:   FileCheck %s --check-prefix=SKIP --match-full-lines
 
 # NORMAL:__TEXT	__DATA	__OBJC	others	dec	hex
-# NORMAL-NEXT:20	100	0	4096	4216	1078	
+# NORMAL-NEXT:20	100	0	4096	4216	1078
 
 # SKIP:__TEXT	__DATA	__OBJC	others	dec	hex
-# SKIP-NEXT:20	100	0	0	120	78	
+# SKIP-NEXT:20	100	0	0	120	78
 
 --- !mach-o
 FileHeader:

llvm/tools/llvm-size/Opts.td

@@ -21,8 +21,9 @@ def grp_mach_o : OptionGroup<"kind">, HelpText<"OPTIONS (Mach-O specific)">;
 def arch_EQ : Joined<["--"], "arch=">, HelpText<"architecture(s) from a Mach-O file to dump">, Group<grp_mach_o>;
 def : Separate<["--", "-"], "arch">, Alias<arch_EQ>;
 def l : F<"l", "When format is darwin, use long format to include addresses and offsets">, Group<grp_mach_o>;
-def z : F<"z", "Do not include __PAGEZERO segment in totals">,
-        Group<grp_mach_o>;
+def exclude_pagezero
+    : FF<"exclude-pagezero", "Do not include __PAGEZERO segment in totals">,
+      Group<grp_mach_o>;
 
 def : F<"A", "Alias for --format">, Alias<format_EQ>, AliasArgs<["sysv"]>;
 def : F<"B", "Alias for --format">, Alias<format_EQ>, AliasArgs<["berkeley"]>;

llvm/tools/llvm-size/llvm-size.cpp

@@ -79,7 +79,7 @@ static bool DarwinLongFormat;
 static RadixTy Radix = RadixTy::decimal;
 static bool TotalSizes;
 static bool HasMachOFiles = false;
-static bool SkipPageZero = false;
+static bool ExcludePageZero = false;
 
 static std::vector<std::string> InputFilenames;
 
@@ -308,15 +308,13 @@ static void printDarwinSegmentSizes(MachOObjectFile *MachO) {
         }
       } else {
         StringRef SegmentName = StringRef(Seg.segname);
-        if (SkipPageZero && SegmentName == "__PAGEZERO")
-          ; // Skip __PAGEZERO segment
-        else if (SegmentName == "__TEXT")
+        if (SegmentName == "__TEXT")
           total_text += Seg.vmsize;
         else if (SegmentName == "__DATA")
           total_data += Seg.vmsize;
         else if (SegmentName == "__OBJC")
           total_objc += Seg.vmsize;
-        else
+        else if (!ExcludePageZero || SegmentName != "__PAGEZERO")
           total_others += Seg.vmsize;
       }
     } else if (Load.C.cmd == MachO::LC_SEGMENT) {
@@ -336,15 +334,13 @@ static void printDarwinSegmentSizes(MachOObjectFile *MachO) {
         }
       } else {
         StringRef SegmentName = StringRef(Seg.segname);
-        if (SkipPageZero && SegmentName == "__PAGEZERO")
-          ; // Skip __PAGEZERO segment
-        else if (SegmentName == "__TEXT")
+        if (SegmentName == "__TEXT")
           total_text += Seg.vmsize;
         else if (SegmentName == "__DATA")
           total_data += Seg.vmsize;
         else if (SegmentName == "__OBJC")
           total_objc += Seg.vmsize;
-        else
+        else if (!ExcludePageZero || SegmentName != "__PAGEZERO")
           total_others += Seg.vmsize;
       }
     }
@@ -919,7 +915,7 @@ int llvm_size_main(int argc, char **argv, const llvm::ToolContext &) {
 
   ELFCommons = Args.hasArg(OPT_common);
   DarwinLongFormat = Args.hasArg(OPT_l);
-  SkipPageZero = Args.hasArg(OPT_z);
+  ExcludePageZero = Args.hasArg(OPT_exclude_pagezero);
   TotalSizes = Args.hasArg(OPT_totals);
   StringRef V = Args.getLastArgValue(OPT_format_EQ, "berkeley");
   if (V == "berkeley")