Address review comments for reusable function

Author: RAJAGOPALAN-GANGADHARAN

include/swift/Driver/ToolChain.h

@@ -249,14 +249,14 @@ class ToolChain {
   const Driver &getDriver() const { return D; }
   const llvm::Triple &getTriple() const { return Triple; }
 
+  /// Special handling for passing down '-l' arguments.
+  ///
+  /// Not all downstream tools (lldb, ld etc.) consistently accept
+  /// a space between the '-l' flag and its argument, so we remove
+  /// the extra space if it was present in \c Args.
   static void addLinkedLibArgs(const llvm::opt::ArgList &Args,
                                llvm::opt::ArgStringList &FrontendArgs);
 
-  static void addArgsFromGroupExcept(const llvm::opt::ArgList &Args,
-                                     llvm::opt::ArgStringList &FrontendArgs,
-                                     llvm::opt::OptSpecifier groupID,
-                                     llvm::opt::OptSpecifier exceptID);
-
   /// Construct a Job for the action \p JA, taking the given information into
   /// account.
   ///

lib/Driver/DarwinToolChains.cpp

@@ -796,9 +796,8 @@ toolchains::Darwin::constructInvocation(const DynamicLinkJobAction &job,
   Arguments.push_back("-no_objc_category_merging");
 
   // These custom arguments should be right before the object file at the end.
-  ToolChain::addArgsFromGroupExcept(context.Args, Arguments,
-                                    options::OPT_linker_option_Group,
-                                    options::OPT_l);
+  context.Args.AddAllArgsExcept(Arguments, {options::OPT_linker_option_Group},
+                                {options::OPT_l});
   ToolChain::addLinkedLibArgs(context.Args, Arguments);
   context.Args.AddAllArgValues(Arguments, options::OPT_Xlinker);
 

lib/Driver/ToolChain.cpp

@@ -287,7 +287,6 @@ mergeBatchInputs(ArrayRef<const Job *> jobs,
   return false;
 }
 
-/// Remove space for -l arg values from \c Args and add to \c FrontendArgs
 void ToolChain::addLinkedLibArgs(const llvm::opt::ArgList &Args,
                                  llvm::opt::ArgStringList &FrontendArgs) {
   Args.getLastArg(options::OPT_l);
@@ -297,21 +296,6 @@ void ToolChain::addLinkedLibArgs(const llvm::opt::ArgList &Args,
   }
 }
 
-/// Add all values of a \c groupID from \c Args to \c FrontendArgs .
-/// except for \c exceptID .
-void ToolChain::addArgsFromGroupExcept(const llvm::opt::ArgList &Args,
-                                       llvm::opt::ArgStringList &FrontendArgs,
-                                       llvm::opt::OptSpecifier groupID,
-                                       llvm::opt::OptSpecifier exceptID) {
-  for (auto *Arg : Args) {
-    if (Arg->getOption().matches(groupID) &&
-        !Arg->getOption().matches(exceptID)) {
-      Arg->claim();
-      Arg->render(Args, FrontendArgs);
-    }
-  }
-}
-
 /// Construct a \c BatchJob by merging the constituent \p jobs' CommandOutput,
 /// input \c Job and \c Action members. Call through to \c constructInvocation
 /// on \p BatchJob, to build the \c InvocationInfo.

lib/Driver/UnixToolChains.cpp

@@ -358,9 +358,8 @@ toolchains::GenericUnix::constructInvocation(const DynamicLinkJobAction &job,
   }
 
   // These custom arguments should be right before the object file at the end.
-  ToolChain::addArgsFromGroupExcept(context.Args, Arguments,
-                                    options::OPT_linker_option_Group,
-                                    options::OPT_l);
+  context.Args.AddAllArgsExcept(Arguments, {options::OPT_linker_option_Group},
+                                {options::OPT_l});
   ToolChain::addLinkedLibArgs(context.Args, Arguments);
   context.Args.AddAllArgs(Arguments, options::OPT_Xlinker);
   context.Args.AddAllArgValues(Arguments, options::OPT_Xclang_linker);

lib/Driver/WindowsToolChains.cpp

@@ -179,9 +179,8 @@ toolchains::Windows::constructInvocation(const DynamicLinkJobAction &job,
   }
 
   context.Args.AddAllArgs(Arguments, options::OPT_Xlinker);
-  ToolChain::addArgsFromGroupExcept(context.Args, Arguments,
-                                    options::OPT_linker_option_Group,
-                                    options::OPT_l);
+  context.Args.AddAllArgsExcept(Arguments, {options::OPT_linker_option_Group},
+                                {options::OPT_l});
   ToolChain::addLinkedLibArgs(context.Args, Arguments);
   context.Args.AddAllArgValues(Arguments, options::OPT_Xclang_linker);