Move option handling into addLTOOptions for consistency.

Author: bd1976bris

clang/lib/Driver/ToolChains/CommonArgs.cpp

@@ -1309,6 +1309,17 @@ void tools::addLTOOptions(const ToolChain &ToolChain, const ArgList &Args,
   if (Args.hasArg(options::OPT_ftime_report))
     CmdArgs.push_back(
         Args.MakeArgString(Twine(PluginOptPrefix) + "-time-passes"));
+
+  if (Arg *A = Args.getLastArg(options::OPT_fthinlto_distributor_EQ)) {
+    CmdArgs.push_back(
+        Args.MakeArgString("--thinlto-distributor=" + Twine(A->getValue())));
+    CmdArgs.push_back(
+        Args.MakeArgString("--thinlto-remote-compiler=" +
+                           Twine(ToolChain.getDriver().getClangProgramPath())));
+
+    for (auto A : Args.getAllArgValues(options::OPT_Xthinlto_distributor_EQ))
+      CmdArgs.push_back(Args.MakeArgString("--thinlto-distributor-arg=" + A));
+  }
 }
 
 void tools::addOpenMPRuntimeLibraryPath(const ToolChain &TC,

clang/lib/Driver/ToolChains/Gnu.cpp

@@ -455,21 +455,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
     addLTOOptions(ToolChain, Args, CmdArgs, Output, Inputs,
                   D.getLTOMode() == LTOK_Thin);
 
-  // Forward the DTLTO options to the linker. We add these unconditionally,
-  // rather than in addLTOOptions() as it is the linker that decides whether to
-  // do LTO or not dependent upon whether there are any bitcode input files in
-  // the link.
-  if (Arg *A = Args.getLastArg(options::OPT_fthinlto_distributor_EQ)) {
-    CmdArgs.push_back(
-        Args.MakeArgString("--thinlto-distributor=" + Twine(A->getValue())));
-    CmdArgs.push_back(
-        Args.MakeArgString("--thinlto-remote-compiler=" +
-                           Twine(ToolChain.getDriver().getClangProgramPath())));
-
-    for (auto A : Args.getAllArgValues(options::OPT_Xthinlto_distributor_EQ))
-      CmdArgs.push_back(Args.MakeArgString("--thinlto-distributor-arg=" + A));
-  }
-
   if (Args.hasArg(options::OPT_Z_Xlinker__no_demangle))
     CmdArgs.push_back("--no-demangle");
 

clang/test/Driver/DTLTO/dtlto.c

@@ -27,8 +27,7 @@
 // FORWARD-SAME: "--thinlto-distributor-arg=a3"
 
 /// Check that options are not added without --thinlto-distributor= and
-/// that there is an unused option warning issued for -Xthinlto-distributor=
-/// options. We specify -flto here as these options should be unaffected by it.
+/// that a warning is issued for unused -Xthinlto-distributor options.
 // RUN: %clang @%t_l1.rsp 2>&1 | \
 // RUN:   FileCheck @%t_f.rsp --check-prefix=NODIST
 
@@ -48,3 +47,11 @@
 // DEFAULT: ld.lld
 // DEFAULT-SAME: "--thinlto-distributor=d.exe"
 // DEFAULT-SAME: "--thinlto-remote-compiler={{.*}}clang{{(.exe)?}}"
+
+/// Check that nothing is forwarded when the compiler is not in LTO mode, and that
+/// appropriate unused option warnings are issued.
+// RUN: %clang @%t_l2.rsp 2>&1 | \
+// RUN:   FileCheck @%t_f.rsp --check-prefix=NOFLTO
+
+// NOFLTO: warning: argument unused during compilation: '-fthinlto-distributor=d.exe'
+// NOFLTO: ld.lld