Address a few review comments

Author: mdtoguchi

clang/include/clang/Driver/Action.h

@@ -701,10 +701,10 @@ class OffloadWrapperJobAction : public JobAction {
   // Set the individual wrapping setting.  This is used to tell the wrapper job
   // action that the wrapping (and subsequent compile step) should be done
   // with for-each instead of using -batch.
-  void setIndividualWrap(bool SetValue) { IndividualWrap = SetValue; }
+  void setWrapIndividualFiles() { WrapIndividualFiles = true; }
 
   // Get the individual wrapping setting.
-  bool getIndividualWrap() const { return IndividualWrap; }
+  bool getWrapIndividualFiles() const { return WrapIndividualFiles; }
 
   // Set the offload kind for the current wrapping job action.  Default usage
   // is to use the kind of the current toolchain.
@@ -715,7 +715,7 @@ class OffloadWrapperJobAction : public JobAction {
 
 private:
   bool CompileStep = true;
-  bool IndividualWrap = false;
+  bool WrapIndividualFiles = false;
   OffloadKind Kind = OFK_None;
 };
 

clang/lib/Driver/Driver.cpp

@@ -5437,7 +5437,7 @@ class OffloadingActionBuilder final {
                                                         types::TY_Tempfilelist);
               if (auto *OWA =
                       dyn_cast<OffloadWrapperJobAction>(CompiledDeviceAction))
-                OWA->setIndividualWrap(true);
+                OWA->setWrapIndividualFiles();
               addDeps(CompiledDeviceAction, TC, BoundArch);
             }
             addDeps(DeviceAction, TC, BoundArch);
@@ -5838,7 +5838,7 @@ class OffloadingActionBuilder final {
                         FPGAArchiveWrapperInputs, types::TY_Tempfilelist);
                 if (auto *OWA =
                         dyn_cast<OffloadWrapperJobAction>(CompiledDeviceAction))
-                  OWA->setIndividualWrap(true);
+                  OWA->setWrapIndividualFiles();
                 addDeps(CompiledDeviceAction, TC, nullptr);
               }
               addDeps(DeviceAction, TC, nullptr);

clang/lib/Driver/ToolChains/Clang.cpp

@@ -10269,7 +10269,7 @@ void OffloadWrapper::ConstructJob(Compilation &C, const JobAction &JA,
     // the wrapping and compile step should be done individually.  Ideally this
     // would be controlled at the JobAction creation, but we cannot do that
     // until the compilation of the wrap is it's own JobAction.
-    bool IndividualWrapCompile = WrapperJob.getIndividualWrap();
+    bool IndividualWrapCompile = WrapperJob.getWrapIndividualFiles();
     const InputInfo TempOutput(types::TY_LLVM_BC, WrapperFileName,
                                WrapperFileName);
     if (!IndividualWrapCompile &&
@@ -10316,7 +10316,7 @@ void OffloadWrapper::ConstructJob(Compilation &C, const JobAction &JA,
       SmallString<128> ClangPath(C.getDriver().Dir);
       llvm::sys::path::append(ClangPath, "clang");
       const char *Clang = C.getArgs().MakeArgString(ClangPath);
-      auto Cmd =
+      auto PostWrapCompileCmd =
           std::make_unique<Command>(JA, *this, ResponseFileSupport::None(),
                                     Clang, ClangArgs, std::nullopt);
       if (IndividualWrapCompile) {
@@ -10325,10 +10325,10 @@ void OffloadWrapper::ConstructJob(Compilation &C, const JobAction &JA,
         InputInfoList Inputs;
         Inputs.push_back(TempOutput);
         clang::driver::tools::SYCL::constructLLVMForeachCommand(
-            C, JA, std::move(Cmd), Inputs, Output, this, "", "bc",
-            ParallelJobs);
+            C, JA, std::move(PostWrapCompileCmd), Inputs, Output, this, "",
+            "bc", ParallelJobs);
       } else
-        C.addCommand(std::move(Cmd));
+        C.addCommand(std::move(PostWrapCompileCmd));
     }
     return;
   } // end of SYCL flavor of offload wrapper command creation