Take care of OPT_linker_option_Group to produce desired behaviour

The -l args values are handled by OPT_l and OPT_linker_option_Group,
to do this have created a helper method under Toolchain

Author: RAJAGOPALAN-GANGADHARAN

include/swift/Driver/ToolChain.h

@@ -249,6 +249,14 @@ class ToolChain {
   const Driver &getDriver() const { return D; }
   const llvm::Triple &getTriple() const { return Triple; }
 
+  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,7 +796,10 @@ 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.
-  context.Args.AddAllArgs(Arguments, options::OPT_linker_option_Group);
+  ToolChain::addArgsFromGroupExcept(context.Args, Arguments,
+                                    options::OPT_linker_option_Group,
+                                    options::OPT_l);
+  ToolChain::addLinkedLibArgs(context.Args, Arguments);
   context.Args.AddAllArgValues(Arguments, options::OPT_Xlinker);
 
   // This should be the last option, for convenience in checking output.

lib/Driver/ToolChain.cpp

@@ -287,6 +287,31 @@ 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);
+  for (auto Arg : Args.getAllArgValues(options::OPT_l)) {
+    const std::string lArg("-l" + Arg);
+    FrontendArgs.push_back(Args.MakeArgString(Twine(lArg)));
+  }
+}
+
+/// 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/ToolChains.cpp

@@ -142,13 +142,6 @@ static void addLTOArgs(const OutputInfo &OI, ArgStringList &arguments) {
   }
 }
 
-static void addLinkedLibArgs(const ArgList &Args, ArgStringList &FrontendArgs) {
-  Args.getLastArg(options::OPT_l);
-  for (auto Arg : Args.getAllArgValues(options::OPT_l)) {
-    const std::string lArg("-l" + Arg);
-    FrontendArgs.push_back(Args.MakeArgString(Twine(lArg)));
-  }
-}
 
 void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
                                       const CommandOutput &output,
@@ -851,7 +844,7 @@ ToolChain::constructInvocation(const InterpretJobAction &job,
   Arguments.push_back(context.Args.MakeArgString(context.OI.ModuleName));
 
   context.Args.AddAllArgs(Arguments, options::OPT_framework);
-  addLinkedLibArgs(context.Args, Arguments);
+  ToolChain::addLinkedLibArgs(context.Args, Arguments);
 
   // The immediate arguments must be last.
   context.Args.AddLastArg(Arguments, options::OPT__DASH_DASH);
@@ -1200,7 +1193,7 @@ ToolChain::constructInvocation(const REPLJobAction &job,
 
   context.Args.AddLastArg(FrontendArgs, options::OPT_import_objc_header);
   context.Args.AddAllArgs(FrontendArgs, options::OPT_framework, options::OPT_L);
-  addLinkedLibArgs(context.Args, FrontendArgs);
+  ToolChain::addLinkedLibArgs(context.Args, FrontendArgs);
 
   if (!useLLDB) {
     FrontendArgs.insert(FrontendArgs.begin(), {"-frontend", "-repl"});

lib/Driver/UnixToolChains.cpp

@@ -358,7 +358,10 @@ toolchains::GenericUnix::constructInvocation(const DynamicLinkJobAction &job,
   }
 
   // These custom arguments should be right before the object file at the end.
-  context.Args.AddAllArgs(Arguments, options::OPT_linker_option_Group);
+  ToolChain::addArgsFromGroupExcept(context.Args, 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,7 +179,10 @@ toolchains::Windows::constructInvocation(const DynamicLinkJobAction &job,
   }
 
   context.Args.AddAllArgs(Arguments, options::OPT_Xlinker);
-  context.Args.AddAllArgs(Arguments, options::OPT_linker_option_Group);
+  ToolChain::addArgsFromGroupExcept(context.Args, Arguments,
+                                    options::OPT_linker_option_Group,
+                                    options::OPT_l);
+  ToolChain::addLinkedLibArgs(context.Args, Arguments);
   context.Args.AddAllArgValues(Arguments, options::OPT_Xclang_linker);
 
   // Run clang in verbose mode if "-v" is set