Fix "Option 'o' registered more than once!" for merge-module-summary

Author: kateinoigakukun

include/swift/Option/Options.h

@@ -39,6 +39,7 @@ namespace options {
     SupplementaryOutput = (1 << 14),
     SwiftAPIExtractOption = (1 << 15),
     SwiftSymbolGraphExtractOption = (1 << 16),
+    SwiftMergeModuleSummaryOption = (1 << 17),
   };
 
   enum ID {

include/swift/Option/Options.td

@@ -61,6 +61,8 @@ def SwiftAPIExtractOption : OptionFlag;
 // The option should be accepted by swift-symbolgraph-extract.
 def SwiftSymbolGraphExtractOption : OptionFlag;
 
+def SwiftMergeModuleSummaryOption : OptionFlag;
+
 /////////
 // Options
 
@@ -177,6 +179,7 @@ def driver_mode : Joined<["--"], "driver-mode=">, Flags<[HelpHidden]>,
 def help : Flag<["-", "--"], "help">,
   Flags<[FrontendOption, AutolinkExtractOption, ModuleWrapOption,
          SwiftIndentOption, SwiftAPIExtractOption,
+         SwiftMergeModuleSummaryOption,
          SwiftSymbolGraphExtractOption]>,
   HelpText<"Display available options">;
 def h : Flag<["-"], "h">, Alias<help>;
@@ -200,6 +203,7 @@ def _DASH_DASH : Option<["--"], "", KIND_REMAINING_ARGS>,
 def o : JoinedOrSeparate<["-"], "o">,
   Flags<[FrontendOption, AutolinkExtractOption, ModuleWrapOption,
          NoInteractiveOption, SwiftIndentOption, ArgumentIsPath,
+         SwiftMergeModuleSummaryOption,
          SwiftAPIExtractOption]>,
   HelpText<"Write output to <file>">, MetaVarName<"<file>">;
 
@@ -1043,7 +1047,7 @@ def Xclang_linker : Separate<["-"], "Xclang-linker">, Flags<[HelpHidden]>,
   MetaVarName<"<arg>">, HelpText<"Pass <arg> to Clang when it is use for linking.">;
 
 def Xllvm : Separate<["-"], "Xllvm">,
-  Flags<[FrontendOption, HelpHidden]>,
+  Flags<[FrontendOption, HelpHidden, SwiftMergeModuleSummaryOption]>,
   MetaVarName<"<arg>">, HelpText<"Pass <arg> to LLVM.">;
 
 def resource_dir : Separate<["-"], "resource-dir">,

test/LTO/module_summary_generic_type_ref.swift

@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend -emit-sib -emit-module-summary-path %t/default_wt.swiftmodule.summary -module-name default_wt -Xllvm -module-summary-embed-debug-name %s
-// RUN: %swift_frontend_plain -merge-module-summary %t/default_wt.swiftmodule.summary -module-summary-embed-debug-name -o %t/default_wt.swiftmodule.merged-summary
+// RUN: %swift_frontend_plain -merge-module-summary %t/default_wt.swiftmodule.summary -Xllvm -module-summary-embed-debug-name -o %t/default_wt.swiftmodule.merged-summary
 // RUN: %swift-module-summary-test --to-yaml %t/default_wt.swiftmodule.merged-summary -o %t/default_wt.merged-summary.yaml
 
 // Ensure that optimizer won't eliminate PrimitiveSequenceType.getPrimitiveSequence

tools/driver/cross_module_opt_main.cpp

@@ -26,15 +26,48 @@ using namespace llvm::opt;
 using namespace swift;
 using namespace modulesummary;
 
+class MergeModuleSummaryInvocation {
+public:
+  std::string OutputFilename;
+  std::vector<std::string> InputFilenames;
+
+  bool parseArgs(ArrayRef<const char *> Args, DiagnosticEngine &Diags) {
+    using namespace options;
+
+    std::unique_ptr<llvm::opt::OptTable> Table = createSwiftOptTable();
+    unsigned MissingIndex;
+    unsigned MissingCount;
+    llvm::opt::InputArgList ParsedArgs =
+      Table->ParseArgs(Args, MissingIndex, MissingCount, SwiftMergeModuleSummaryOption);
+
+    if (MissingCount) {
+      Diags.diagnose(SourceLoc(), diag::error_missing_arg_value,
+                     ParsedArgs.getArgString(MissingIndex), MissingCount);
+      return true;
+    }
+
+    for (const Arg *A : ParsedArgs.filtered(OPT_INPUT)) {
+      InputFilenames.push_back(A->getValue());
+    }
+
+    if (const Arg *A = ParsedArgs.getLastArg(OPT_o)) {
+      OutputFilename = A->getValue();
+    }
+
+    std::vector<const char *> LLVMArgs {""};
+    for (const Arg *A : ParsedArgs.filtered(OPT_Xllvm)) {
+      LLVMArgs.push_back(A->getValue());
+    }
+
+    llvm::cl::ParseCommandLineOptions(LLVMArgs.size(), LLVMArgs.data(), "");
+    return false;
+  }
+};
+
 static llvm::cl::opt<std::string>
     LTOPrintLiveTrace("lto-print-live-trace", llvm::cl::init(""),
                       llvm::cl::desc("Print liveness trace for the symbol"));
 
-static llvm::cl::list<std::string>
-    InputFilenames(llvm::cl::Positional, llvm::cl::desc("[input files...]"));
-static llvm::cl::opt<std::string>
-    OutputFilename("o", llvm::cl::desc("output filename"));
-
 static llvm::DenseSet<GUID> computePreservedGUIDs(ModuleSummaryIndex *summary) {
   llvm::DenseSet<GUID> Set(1);
   for (auto FI = summary->functions_begin(), FE = summary->functions_end();
@@ -239,21 +272,24 @@ int cross_module_opt_main(ArrayRef<const char *> Args, const char *Argv0,
                           void *MainAddr) {
   INITIALIZE_LLVM();
 
-  llvm::cl::ParseCommandLineOptions(Args.size(), Args.data(), "Swift LTO\n");
-
   CompilerInstance Instance;
   PrintingDiagnosticConsumer PDC;
   Instance.addDiagnosticConsumer(&PDC);
 
-  if (InputFilenames.empty()) {
+  MergeModuleSummaryInvocation Invocation;
+  if (Invocation.parseArgs(Args, Instance.getDiags())) {
+    return true;
+  }
+
+  if (Invocation.InputFilenames.empty()) {
     Instance.getDiags().diagnose(SourceLoc(),
                                  diag::error_mode_requires_an_input_file);
     return 1;
   }
 
   auto TheSummary = std::make_unique<ModuleSummaryIndex>();
 
-  for (auto Filename : InputFilenames) {
+  for (auto Filename : Invocation.InputFilenames) {
     LLVM_DEBUG(llvm::dbgs() << "Loading module summary " << Filename << "\n");
     auto ErrOrBuf = llvm::MemoryBuffer::getFile(Filename);
     if (!ErrOrBuf) {
@@ -276,6 +312,6 @@ int cross_module_opt_main(ArrayRef<const char *> Args, const char *Argv0,
   markDeadSymbols(*TheSummary.get(), PreservedGUIDs);
 
   modulesummary::writeModuleSummaryIndex(*TheSummary, Instance.getDiags(),
-                                         OutputFilename);
+                                         Invocation.OutputFilename);
   return 0;
 }