Rename option -icf MODE to --icf=MODE

[gkm]

Summary

The icf command-line option is not present in ld64, so it should use the LLD option syntax, which begins with double dashes and separates primary option from any suboption with the equal sign.

[thakis]

Thanks!

lld/MachO/Driver.cpp

715

/me idly wonders if we should do something like this with for --deduplicate-literals + -no_deduplicate as well

lld/MachO/Driver.cpp

else
       error("'-undefined suppress' only valid with '-flat_namespace'");
     treatment = UndefinedSymbolTreatment::error;
   }
   return treatment;
 }
 
 static ICFLevel getICFLevel(const ArgList &args) {
   bool noDeduplicate = args.hasArg(OPT_no_deduplicate);
-  StringRef icfLevelStr = args.getLastArgValue(OPT_icf);
+  StringRef icfLevelStr = args.getLastArgValue(OPT_icf_eq);
   auto icfLevel = StringSwitch<ICFLevel>(icfLevelStr)
                       .Cases("none", "", ICFLevel::none)
                       .Case("safe", ICFLevel::safe)
                       .Case("all", ICFLevel::all)
                       .Default(ICFLevel::unknown);
   if (icfLevel == ICFLevel::unknown) {
-    warn(Twine("unknown -icf OPTION `") + icfLevelStr +
+    warn(Twine("unknown --icf=OPTION `") + icfLevelStr +
          "', defaulting to `none'");
     icfLevel = ICFLevel::none;
   } else if (icfLevel != ICFLevel::none && noDeduplicate) {
-    warn(Twine("`-icf " + icfLevelStr +
+    warn(Twine("`--icf=" + icfLevelStr +
                "' conflicts with -no_deduplicate, setting to `none'"));
     icfLevel = ICFLevel::none;
   } else if (icfLevel == ICFLevel::safe) {
-    warn(Twine("`-icf safe' is not yet implemented, reverting to `none'"));
+    warn(Twine("`--icf=safe' is not yet implemented, reverting to `none'"));
     icfLevel = ICFLevel::none;
   }
   return icfLevel;
 }
 
 static void warnIfDeprecatedOption(const Option &opt) {
   if (!opt.getGroup().isValid())
     return;

lld/MachO/Options.td

def time_trace_file_eq: Joined<["--"], "time-trace-file=">,
     HelpText<"Specify time trace output file">,
     Group<grp_lld>;
 def deduplicate_literals: Flag<["--"], "deduplicate-literals">,
     HelpText<"Enable literal deduplication">,
     Group<grp_lld>;
 def print_dylib_search: Flag<["--"], "print-dylib-search">,
     HelpText<"Print which paths lld searched when trying to find dylibs">,
     Group<grp_lld>;
+def icf_eq: Joined<["--"], "icf=">,
+    HelpText<"Set level for identical code folding (default: none)">,
+    MetaVarName<"[none,safe,all]">,
+    Group<grp_lld>;
 
 // This is a complete Options.td compiled from Apple's ld(1) manpage
 // dated 2018-03-07 and cross checked with ld64 source code in repo
 // https://github.com/apple-opensource/ld64 at git tag "512.4" dated
 // 2018-03-18.
 
 // Flags<[HelpHidden]> marks options that are not yet ported to lld,
 // and serve as a scoreboard for annotating our progress toward

 def merge_zero_fill_sections : Flag<["-"], "merge_zero_fill_sections">,
     HelpText<"Merge all zeroed data into the __zerofill section">,
     Flags<[HelpHidden]>,
     Group<grp_opts>;
 def no_branch_islands : Flag<["-"], "no_branch_islands">,
     HelpText<"Disable infra for branches beyond the maximum branch distance.">,
     Flags<[HelpHidden]>,
     Group<grp_opts>;
-def icf: Separate<["-"], "icf">,
-    HelpText<"Set level for identical code folding (default: none)">,
-    MetaVarName<"[none,safe,all]">,
-    Group<grp_opts>;
 def no_deduplicate : Flag<["-"], "no_deduplicate">,
-    HelpText<"Disable code deduplicaiton (synonym for `-icf none')">,
+    HelpText<"Disable code deduplicaiton (synonym for `--icf=none')">,
     Group<grp_opts>;
 
 def grp_version : OptionGroup<"version">, HelpText<"VERSION TARGETING">;
 
 def platform_version : MultiArg<["-"], "platform_version", 3>,
     MetaVarName<"<platform> <min_version> <sdk_version>">,
     HelpText<"Platform (e.g., macos, ios, tvos, watchos, bridgeos, mac-catalyst, ios-sim, tvos-sim, watchos-sim, driverkit) and version numbers">,
     Group<grp_version>;

lld/test/MachO/icf-options.s

 # REQUIRES: x86
 # RUN: rm -rf %t; mkdir %t
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/main.o
-# RUN: %lld -lSystem -icf all -o %t/all %t/main.o 2>&1 \
+# RUN: %lld -lSystem --icf=all -o %t/all %t/main.o 2>&1 \
 # RUN:     | FileCheck %s --check-prefix=DIAG-EMPTY --allow-empty
-# RUN: %lld -lSystem -icf none -o %t/none %t/main.o 2>&1 \
+# RUN: %lld -lSystem --icf=none -o %t/none %t/main.o 2>&1 \
 # RUN:     | FileCheck %s --check-prefix=DIAG-EMPTY --allow-empty
 # RUN: %lld -lSystem -no_deduplicate -o %t/no_dedup %t/main.o 2>&1 \
 # RUN:     | FileCheck %s --check-prefix=DIAG-EMPTY --allow-empty
-# RUN: not %lld -lSystem -icf safe -o %t/safe %t/main.o 2>&1 \
+# RUN: not %lld -lSystem --icf=safe -o %t/safe %t/main.o 2>&1 \
 # RUN:     | FileCheck %s --check-prefix=DIAG-SAFE
-# RUN: not %lld -lSystem -icf junk -o %t/junk %t/main.o 2>&1 \
+# RUN: not %lld -lSystem --icf=junk -o %t/junk %t/main.o 2>&1 \
 # RUN:     | FileCheck %s --check-prefix=DIAG-JUNK
-# RUN: not %lld -lSystem -icf all -no_deduplicate -o %t/clash %t/main.o 2>&1 \
+# RUN: not %lld -lSystem --icf=all -no_deduplicate -o %t/clash %t/main.o 2>&1 \
 # RUN:     | FileCheck %s --check-prefix=DIAG-CLASH
 
 # DIAG-EMPTY-NOT: {{.}}
-# DIAG-SAFE: `-icf safe' is not yet implemented, reverting to `none'
-# DIAG-JUNK: unknown -icf OPTION `junk', defaulting to `none'
-# DIAG-CLASH: `-icf all' conflicts with -no_deduplicate, setting to `none'
+# DIAG-SAFE: `--icf=safe' is not yet implemented, reverting to `none'
+# DIAG-JUNK: unknown --icf=OPTION `junk', defaulting to `none'
+# DIAG-CLASH: `--icf=all' conflicts with -no_deduplicate, setting to `none'
 
 # RUN: llvm-objdump -d --syms %t/all | FileCheck %s --check-prefix=FOLD
 # RUN: llvm-objdump -d --syms %t/none | FileCheck %s --check-prefix=NOOP
 # RUN: llvm-objdump -d --syms %t/no_dedup | FileCheck %s --check-prefix=NOOP
 
 # FOLD-LABEL: SYMBOL TABLE:
 # FOLD:       [[#%x,MAIN:]] g   F __TEXT,__text _main
 # FOLD:       [[#%x,F:]]    g   F __TEXT,__text _f1

lld/test/MachO/icf-scale.s

 # REQUIRES: x86
 # RUN: rm -rf %t*
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
-# RUN: %lld -lSystem -icf all -o %t %t.o
+# RUN: %lld -lSystem --icf=all -o %t %t.o
 # RUN: llvm-objdump -d --syms %t | FileCheck %s
 
 ## When ICF has fewer than 1 Ki functions to segregate into equivalence classes,
 ## it uses a sequential algorithm to avoid the overhead of threading.
 ## At 1 Ki functions or more, when threading begins to pay-off, ICF employs its
 ## parallel segregation algorithm. Here we generate 4 Ki functions to exercise
 ## the parallel algorithm. There are 4 unique function bodies, each replicated
 ## 1 Ki times. The resulting folded program should retain one instance for each

lld/test/MachO/icf.s

 # REQUIRES: x86
 # RUN: rm -rf %t; mkdir %t
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t/main.o
-# RUN: %lld -lSystem -icf all -o %t/main %t/main.o
+# RUN: %lld -lSystem --icf=all -o %t/main %t/main.o
 # RUN: llvm-objdump -d --syms %t/main | FileCheck %s
 
 # CHECK-LABEL: SYMBOL TABLE:
 # CHECK:       [[#%x,MAIN:]] g   F __TEXT,__text _main
 # CHECK:       [[#%x,A:]]    g   F __TEXT,__text _a1
 # CHECK:       [[#%x,A]]     g   F __TEXT,__text _a2
 # CHECK:       [[#%x,C:]]    g   F __TEXT,__text _c
 # CHECK:       [[#%x,D:]]    g   F __TEXT,__text _d