Addressed review comments

Signed-off-by: Sergey Dmitriev <[email protected]>

Author: sndmitriev

clang/lib/Driver/Driver.cpp

@@ -2887,7 +2887,7 @@ class OffloadingActionBuilder final {
     virtual void appendLinkDependences(OffloadAction::DeviceDependences &DA) {}
 
     /// Append linker actions generated by the builder.
-    virtual void addDeviceLinkDependences(OffloadDepsJobAction *DA) {}
+    virtual void addDeviceLinkDependencies(OffloadDepsJobAction *DA) {}
 
     /// Initialize the builder. Return true if any initialization errors are
     /// found.
@@ -3610,7 +3610,7 @@ class OffloadingActionBuilder final {
 
     void appendLinkDependences(OffloadAction::DeviceDependences &DA) override {}
 
-    void addDeviceLinkDependences(OffloadDepsJobAction *DA) override {
+    void addDeviceLinkDependencies(OffloadDepsJobAction *DA) override {
       for (unsigned I = 0; I < ToolChains.size(); ++I) {
         // Register dependent toolchain.
         DA->registerDependentActionInfo(
@@ -4361,7 +4361,7 @@ class OffloadingActionBuilder final {
       }
     }
 
-    void addDeviceLinkDependences(OffloadDepsJobAction *DA) override {
+    void addDeviceLinkDependencies(OffloadDepsJobAction *DA) override {
       for (unsigned I = 0; I < ToolChains.size(); ++I) {
         // Register dependent toolchain.
         DA->registerDependentActionInfo(
@@ -4774,7 +4774,11 @@ class OffloadingActionBuilder final {
     return false;
   }
 
-  void addDeviceDependencies(ActionList &LinkerInputs) {
+  /// Create link job from the given host inputs and feed the result to offload
+  /// deps job which fetches device dependencies from the linked host image.
+  /// Offload deps output is then forwarded to active device action builders so
+  /// they can add it to the device linker inputs.
+  void addDeviceLinkDependenciesFromHost(ActionList &LinkerInputs) {
     // Link image for reading dependencies from it.
     auto *LA = C.MakeAction<LinkJobAction>(LinkerInputs, types::TY_Image);
 
@@ -4792,7 +4796,7 @@ class OffloadingActionBuilder final {
     for (auto *SB : SpecializedBuilders) {
       if (!SB->isValid())
         continue;
-      SB->addDeviceLinkDependences(DA);
+      SB->addDeviceLinkDependencies(DA);
     }
   }
 
@@ -5123,7 +5127,7 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
   // With static fat archives we need to create additional steps for
   // generating dependence objects for device link actions.
   if (!LinkerInputs.empty() && C.getDriver().getOffloadStaticLibSeen())
-    OffloadBuilder.addDeviceDependencies(LinkerInputs);
+    OffloadBuilder.addDeviceLinkDependenciesFromHost(LinkerInputs);
 
   // Go through all of the args, and create a Linker specific argument list.
   // When dealing with fat static archives each archive is individually
@@ -6026,11 +6030,10 @@ InputInfo Driver::BuildJobsForActionNoCache(
   const JobAction *JA = cast<JobAction>(A);
   ActionList CollapsedOffloadActions;
 
-  const ToolChain *TCForTS = TC;
-  if (auto *DA = dyn_cast<OffloadDepsJobAction>(A))
-    TCForTS = DA->getHostTC();
+  auto *DA = dyn_cast<OffloadDepsJobAction>(JA);
+  const ToolChain *JATC = DA ? DA->getHostTC() : TC;
 
-  ToolSelector TS(JA, *TCForTS, C, isSaveTempsEnabled(),
+  ToolSelector TS(JA, *JATC, C, isSaveTempsEnabled(),
                   embedBitcodeInObject() && !isUsingLTO());
   const Tool *T = TS.getTool(Inputs, CollapsedOffloadActions);
 
@@ -6058,15 +6061,10 @@ InputInfo Driver::BuildJobsForActionNoCache(
     // FIXME: Clean this up.
     bool SubJobAtTopLevel =
         AtTopLevel && (isa<DsymutilJobAction>(A) || isa<VerifyJobAction>(A));
-    if (auto *DA = dyn_cast<OffloadDepsJobAction>(A))
-      InputInfos.push_back(
-          BuildJobsForAction(C, Input, DA->getHostTC(), DA->getOffloadingArch(),
-                             SubJobAtTopLevel, MultipleArchs, LinkingOutput,
-                             CachedResults, DA->getOffloadingDeviceKind()));
-    else
-      InputInfos.push_back(BuildJobsForAction(
-          C, Input, TC, BoundArch, SubJobAtTopLevel, MultipleArchs,
-          LinkingOutput, CachedResults, A->getOffloadingDeviceKind()));
+    InputInfos.push_back(BuildJobsForAction(
+        C, Input, JATC, DA ? DA->getOffloadingArch() : BoundArch,
+        SubJobAtTopLevel, MultipleArchs, LinkingOutput, CachedResults,
+        A->getOffloadingDeviceKind()));
   }
   // Check if we are in sub-work for preprocessing for host side. If so we will
   // add another job to print information to terminal later.
@@ -6257,14 +6255,11 @@ InputInfo Driver::BuildJobsForActionNoCache(
 
       // Get the unique string identifier for this dependence and cache the
       // result.
-      StringRef Arch;
-      if (TargetDeviceOffloadKind == Action::OFK_HIP) {
-        if (DI.DependentOffloadKind == Action::OFK_Host)
-          Arch = StringRef();
-        else
-          Arch = DI.DependentBoundArch;
-      } else
-        Arch = BoundArch;
+      StringRef Arch = TargetDeviceOffloadKind == Action::OFK_HIP
+                           ? DI.DependentOffloadKind == Action::OFK_Host
+                                 ? StringRef()
+                                 : DI.DependentBoundArch
+                           : BoundArch;
 
       CachedResults[{A, GetTriplePlusArchString(DI.DependentToolChain, Arch,
                                                 DI.DependentOffloadKind)}] =