From 7108bf36b6cbdab368a8799069a861e8c5b290f0 Mon Sep 17 00:00:00 2001
From: Samuel Antao <sfantao@us.ibm.com>
Date: Thu, 3 Nov 2016 15:41:50 +0000
Subject: [PATCH] Rename the version of ConstructJob for multiple outputs to
 ConstructJobMultipleOutputs.

It was causing trouble with the GCC bots.

llvm-svn: 285925
---
 clang/include/clang/Driver/Tool.h | 10 +++++-----
 clang/lib/Driver/Driver.cpp       |  2 +-
 clang/lib/Driver/Tool.cpp         | 12 ++++++------
 clang/lib/Driver/Tools.cpp        |  9 ++++-----
 clang/lib/Driver/Tools.h          |  9 +++++----
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/clang/include/clang/Driver/Tool.h b/clang/include/clang/Driver/Tool.h
index 17bbb86..5012cc8 100644
--- 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 f5c7bcd..61b277d 100644
--- 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 cf227be..8184946 100644
--- 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 0279938..386b1d3 100644
--- 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 9687b04..b0d5db9 100644
--- 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
-- 
2.7.4