Rename the version of ConstructJob for multiple outputs to ConstructJobMultipleOutputs.

It was causing trouble with the GCC bots.

llvm-svn: 285925

diff --git a/clang/include/clang/Driver/Tool.h b/clang/include/clang/Driver/Tool.h
index 17bbb86c1e819783b66eb9c321117a3a607e39ec..5012cc896683e6d6590bbf14b9e55ed53a2511c4 100644 (file)
--- a/clang/include/clang/Driver/Tool.h
+++ b/clang/include/clang/Driver/Tool.h
@@ -138,11 +138,11 @@ public:
   /// tool chain specific translations applied.
   /// \param LinkingOutput If this output will eventually feed the
   /// linker, then this is the final output name of the linked image.
-  virtual void ConstructJob(Compilation &C, const JobAction &JA,
-                            const InputInfoList &Outputs,
-                            const InputInfoList &Inputs,
-                            const llvm::opt::ArgList &TCArgs,
-                            const char *LinkingOutput) const;
+  virtual void ConstructJobMultipleOutputs(Compilation &C, const JobAction &JA,
+                                           const InputInfoList &Outputs,
+                                           const InputInfoList &Inputs,
+                                           const llvm::opt::ArgList &TCArgs,
+                                           const char *LinkingOutput) const;
 };
 
 } // end namespace driver

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index f5c7bcddd5f4e9386fa09edbb8e02a5f3fe572ad..61b277df1529a07d43f575ea6e0c05072ac08e7f 100644 (file)
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -3199,7 +3199,7 @@ InputInfo Driver::BuildJobsForActionNoCache(
           C.getArgsForToolChain(TC, BoundArch, JA->getOffloadingDeviceKind()),
           LinkingOutput);
     else
-      T->ConstructJob(
+      T->ConstructJobMultipleOutputs(
           C, *JA, UnbundlingResults, InputInfos,
           C.getArgsForToolChain(TC, BoundArch, JA->getOffloadingDeviceKind()),
           LinkingOutput);

diff --git a/clang/lib/Driver/Tool.cpp b/clang/lib/Driver/Tool.cpp
index cf227bee8313d6b7d6a9d7385754d1cf90ab2ffa..818494662179070f4e47b8d820568ceb9dc26bf8 100644 (file)
--- a/clang/lib/Driver/Tool.cpp
+++ b/clang/lib/Driver/Tool.cpp
@@ -23,11 +23,11 @@ Tool::Tool(const char *_Name, const char *_ShortName, const ToolChain &TC,
 Tool::~Tool() {
 }
 
-void Tool::ConstructJob(Compilation &C, const JobAction &JA,
-                        const InputInfoList &Outputs,
-                        const InputInfoList &Inputs,
-                        const llvm::opt::ArgList &TCArgs,
-                        const char *LinkingOutput) const {
+void Tool::ConstructJobMultipleOutputs(Compilation &C, const JobAction &JA,
+                                       const InputInfoList &Outputs,
+                                       const InputInfoList &Inputs,
+                                       const llvm::opt::ArgList &TCArgs,
+                                       const char *LinkingOutput) const {
   assert(Outputs.size() == 1 && "Expected only one output by default!");
   ConstructJob(C, JA, Outputs.front(), Inputs, TCArgs, LinkingOutput);
-};
+}

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 02799380ab52366d98415b6d7c63a46f70504eb6..386b1d3bd2cdedf064ac6156046586710176e73c 100644 (file)
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -7133,11 +7133,10 @@ void OffloadBundler::ConstructJob(Compilation &C, const JobAction &JA,
       CmdArgs, None));
 }
 
-void OffloadBundler::ConstructJob(Compilation &C, const JobAction &JA,
-                                  const InputInfoList &Outputs,
-                                  const InputInfoList &Inputs,
-                                  const llvm::opt::ArgList &TCArgs,
-                                  const char *LinkingOutput) const {
+void OffloadBundler::ConstructJobMultipleOutputs(
+    Compilation &C, const JobAction &JA, const InputInfoList &Outputs,
+    const InputInfoList &Inputs, const llvm::opt::ArgList &TCArgs,
+    const char *LinkingOutput) const {
   // The version with multiple outputs is expected to refer to a unbundling job.
   auto &UA = cast<OffloadUnbundlingJobAction>(JA);
 

diff --git a/clang/lib/Driver/Tools.h b/clang/lib/Driver/Tools.h
index 9687b0465273c400cfdd083dcf9519cf6bc6d673..b0d5db9ec84f8f2381533d41e21106cfe8e33019 100644 (file)
--- a/clang/lib/Driver/Tools.h
+++ b/clang/lib/Driver/Tools.h
@@ -148,10 +148,11 @@ public:
                     const InputInfo &Output, const InputInfoList &Inputs,
                     const llvm::opt::ArgList &TCArgs,
                     const char *LinkingOutput) const override;
-  void ConstructJob(Compilation &C, const JobAction &JA,
-                    const InputInfoList &Outputs, const InputInfoList &Inputs,
-                    const llvm::opt::ArgList &TCArgs,
-                    const char *LinkingOutput) const override;
+  void ConstructJobMultipleOutputs(Compilation &C, const JobAction &JA,
+                                   const InputInfoList &Outputs,
+                                   const InputInfoList &Inputs,
+                                   const llvm::opt::ArgList &TCArgs,
+                                   const char *LinkingOutput) const override;
 };
 
 /// \brief Base class for all GNU tools that provide the same behavior when