review: use terminology directed for objcopy

Author: inbelic

clang/include/clang/Driver/Action.h

@@ -76,10 +76,10 @@ class Action {
     StaticLibJobClass,
     BinaryAnalyzeJobClass,
     BinaryTranslatorJobClass,
-    BinaryModifyJobClass,
+    ObjcopyJobClass,
 
     JobClassFirst = PreprocessJobClass,
-    JobClassLast = BinaryModifyJobClass
+    JobClassLast = ObjcopyJobClass
   };
 
   // The offloading kind determines if this action is binded to a particular
@@ -688,14 +688,14 @@ class BinaryTranslatorJobAction : public JobAction {
   }
 };
 
-class BinaryModifyJobAction : public JobAction {
+class ObjcopyJobAction : public JobAction {
   void anchor() override;
 
 public:
-  BinaryModifyJobAction(Action *Input, types::ID Type);
+  ObjcopyJobAction(Action *Input, types::ID Type);
 
   static bool classof(const Action *A) {
-    return A->getKind() == BinaryModifyJobClass;
+    return A->getKind() == ObjcopyJobClass;
   }
 };
 

clang/lib/Driver/Action.cpp

@@ -52,8 +52,8 @@ const char *Action::getClassName(ActionClass AC) {
     return "binary-analyzer";
   case BinaryTranslatorJobClass:
     return "binary-translator";
-  case BinaryModifyJobClass:
-    return "binary-modifier";
+  case ObjcopyJobClass:
+    return "objcopy";
   }
 
   llvm_unreachable("invalid class");
@@ -470,7 +470,7 @@ BinaryTranslatorJobAction::BinaryTranslatorJobAction(Action *Input,
                                                      types::ID Type)
     : JobAction(BinaryTranslatorJobClass, Input, Type) {}
 
-void BinaryModifyJobAction::anchor() {}
+void ObjcopyJobAction::anchor() {}
 
-BinaryModifyJobAction::BinaryModifyJobAction(Action *Input, types::ID Type)
-    : JobAction(BinaryModifyJobClass, Input, Type) {}
+ObjcopyJobAction::ObjcopyJobAction(Action *Input, types::ID Type)
+    : JobAction(ObjcopyJobClass, Input, Type) {}

clang/lib/Driver/Driver.cpp

@@ -4669,8 +4669,8 @@ void Driver::BuildDefaultActions(Compilation &C, DerivedArgList &Args,
       // (TY_OBJECT).
       if (LastAction->getType() == types::TY_DX_CONTAINER ||
           LastAction->getType() == types::TY_Object)
-        Actions.push_back(C.MakeAction<BinaryModifyJobAction>(
-            LastAction, types::TY_DX_CONTAINER));
+        Actions.push_back(
+            C.MakeAction<ObjcopyJobAction>(LastAction, types::TY_DX_CONTAINER));
     }
   }
 

clang/lib/Driver/ToolChain.cpp

@@ -652,7 +652,7 @@ Tool *ToolChain::getTool(Action::ActionClass AC) const {
   case Action::VerifyDebugInfoJobClass:
   case Action::BinaryAnalyzeJobClass:
   case Action::BinaryTranslatorJobClass:
-  case Action::BinaryModifyJobClass:
+  case Action::ObjcopyJobClass:
     llvm_unreachable("Invalid tool kind.");
 
   case Action::CompileJobClass:

clang/lib/Driver/ToolChains/HLSL.cpp

@@ -295,11 +295,11 @@ void tools::hlsl::MetalConverter::ConstructJob(
                                          Exec, CmdArgs, Inputs, Input));
 }
 
-void tools::hlsl::LLVMObjcopy::ConstructJob(Compilation &C, const JobAction &JA,
-                                            const InputInfo &Output,
-                                            const InputInfoList &Inputs,
-                                            const ArgList &Args,
-                                            const char *LinkingOutput) const {
+void tools::LLVMObjcopy::ConstructJob(Compilation &C, const JobAction &JA,
+                                      const InputInfo &Output,
+                                      const InputInfoList &Inputs,
+                                      const ArgList &Args,
+                                      const char *LinkingOutput) const {
 
   std::string ObjcopyPath = getToolChain().GetProgramPath("llvm-objcopy");
   const char *Exec = Args.MakeArgString(ObjcopyPath);
@@ -339,9 +339,9 @@ Tool *clang::driver::toolchains::HLSLToolChain::getTool(
     if (!MetalConverter)
       MetalConverter.reset(new tools::hlsl::MetalConverter(*this));
     return MetalConverter.get();
-  case Action::BinaryModifyJobClass:
+  case Action::ObjcopyJobClass:
     if (!LLVMObjcopy)
-      LLVMObjcopy.reset(new tools::hlsl::LLVMObjcopy(*this));
+      LLVMObjcopy.reset(new tools::LLVMObjcopy(*this));
     return LLVMObjcopy.get();
   default:
     return ToolChain::getTool(AC);
@@ -498,7 +498,7 @@ bool HLSLToolChain::isLastJob(DerivedArgList &Args,
       (!HasTranslation && HasValidation &&
        AC == Action::BinaryAnalyzeJobClass) ||
       (!HasTranslation && !HasValidation && HasObjcopy &&
-       AC == Action::BinaryModifyJobClass))
+       AC == Action::ObjcopyJobClass))
     return true;
   return false;
 }

clang/lib/Driver/ToolChains/HLSL.h

@@ -43,10 +43,11 @@ class LLVM_LIBRARY_VISIBILITY MetalConverter : public Tool {
                     const char *LinkingOutput) const override;
 };
 
+} // namespace hlsl
+
 class LLVM_LIBRARY_VISIBILITY LLVMObjcopy : public Tool {
 public:
-  LLVMObjcopy(const ToolChain &TC)
-      : Tool("hlsl::LLVMObjcopy", "llvm-objcopy", TC) {}
+  LLVMObjcopy(const ToolChain &TC) : Tool("LLVMObjcopy", "llvm-objcopy", TC) {}
 
   bool hasIntegratedCPP() const override { return false; }
 
@@ -55,7 +56,7 @@ class LLVM_LIBRARY_VISIBILITY LLVMObjcopy : public Tool {
                     const llvm::opt::ArgList &TCArgs,
                     const char *LinkingOutput) const override;
 };
-} // namespace hlsl
+
 } // namespace tools
 
 namespace toolchains {
@@ -87,7 +88,7 @@ class LLVM_LIBRARY_VISIBILITY HLSLToolChain : public ToolChain {
 private:
   mutable std::unique_ptr<tools::hlsl::Validator> Validator;
   mutable std::unique_ptr<tools::hlsl::MetalConverter> MetalConverter;
-  mutable std::unique_ptr<tools::hlsl::LLVMObjcopy> LLVMObjcopy;
+  mutable std::unique_ptr<tools::LLVMObjcopy> LLVMObjcopy;
 };
 
 } // end namespace toolchains