Address review comments

Author: kovdan01

clang/include/clang/Driver/ToolChain.h

@@ -214,6 +214,9 @@ class ToolChain {
                                               FileType Type, bool AddArch,
                                               bool IsFortran = false) const;
 
+  virtual void addPointerAuthFlags(const llvm::opt::ArgList &DriverArgs,
+                                   llvm::opt::ArgStringList &CC1Args) const;
+
   /// Find the target-specific subdirectory for the current target triple under
   /// \p BaseDir, doing fallback triple searches as necessary.
   /// \return The subdirectory path if it exists.

clang/lib/Driver/ToolChain.cpp

@@ -783,6 +783,32 @@ std::string ToolChain::buildCompilerRTBasename(const llvm::opt::ArgList &Args,
   return (Prefix + Twine(LibName) + Component + ArchAndEnv + Suffix).str();
 }
 
+void ToolChain::addPointerAuthFlags(const llvm::opt::ArgList &DriverArgs,
+                                    llvm::opt::ArgStringList &CC1Args) const {
+  DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_intrinsics,
+                          options::OPT_fno_ptrauth_intrinsics);
+  DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_calls,
+                          options::OPT_fno_ptrauth_calls);
+  DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_returns,
+                          options::OPT_fno_ptrauth_returns);
+  DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_auth_traps,
+                          options::OPT_fno_ptrauth_auth_traps);
+  DriverArgs.addOptInFlag(
+      CC1Args, options::OPT_fptrauth_vtable_pointer_address_discrimination,
+      options::OPT_fno_ptrauth_vtable_pointer_address_discrimination);
+  DriverArgs.addOptInFlag(
+      CC1Args, options::OPT_fptrauth_vtable_pointer_type_discrimination,
+      options::OPT_fno_ptrauth_vtable_pointer_type_discrimination);
+  DriverArgs.addOptInFlag(
+      CC1Args, options::OPT_fptrauth_type_info_vtable_pointer_discrimination,
+      options::OPT_fno_ptrauth_type_info_vtable_pointer_discrimination);
+  DriverArgs.addOptInFlag(
+      CC1Args, options::OPT_fptrauth_function_pointer_type_discrimination,
+      options::OPT_fno_ptrauth_function_pointer_type_discrimination);
+  DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_indirect_gotos,
+                          options::OPT_fno_ptrauth_indirect_gotos);
+}
+
 std::string ToolChain::getCompilerRT(const ArgList &Args, StringRef Component,
                                      FileType Type, bool IsFortran) const {
   // Check for runtime files in the new layout without the architecture first.

clang/lib/Driver/ToolChains/Linux.cpp

@@ -533,38 +533,9 @@ static void handlePAuthABI(const Driver &D, const ArgList &DriverArgs,
     CC1Args.push_back("-faarch64-jump-table-hardening");
 }
 
-static void addPointerAuthFlags(const llvm::opt::ArgList &DriverArgs,
-                                llvm::opt::ArgStringList &CC1Args) {
-  DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_intrinsics,
-                          options::OPT_fno_ptrauth_intrinsics);
-
-  DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_calls,
-                          options::OPT_fno_ptrauth_calls);
-
-  DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_returns,
-                          options::OPT_fno_ptrauth_returns);
-
-  DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_auth_traps,
-                          options::OPT_fno_ptrauth_auth_traps);
-
-  DriverArgs.addOptInFlag(
-      CC1Args, options::OPT_fptrauth_vtable_pointer_address_discrimination,
-      options::OPT_fno_ptrauth_vtable_pointer_address_discrimination);
-
-  DriverArgs.addOptInFlag(
-      CC1Args, options::OPT_fptrauth_vtable_pointer_type_discrimination,
-      options::OPT_fno_ptrauth_vtable_pointer_type_discrimination);
-
-  DriverArgs.addOptInFlag(
-      CC1Args, options::OPT_fptrauth_type_info_vtable_pointer_discrimination,
-      options::OPT_fno_ptrauth_type_info_vtable_pointer_discrimination);
-
-  DriverArgs.addOptInFlag(
-      CC1Args, options::OPT_fptrauth_function_pointer_type_discrimination,
-      options::OPT_fno_ptrauth_function_pointer_type_discrimination);
-
-  DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_indirect_gotos,
-                          options::OPT_fno_ptrauth_indirect_gotos);
+void Linux::addPointerAuthFlags(const llvm::opt::ArgList &DriverArgs,
+                                llvm::opt::ArgStringList &CC1Args) const {
+  ToolChain::addPointerAuthFlags(DriverArgs, CC1Args);
 
   DriverArgs.addOptInFlag(CC1Args, options::OPT_fptrauth_init_fini,
                           options::OPT_fno_ptrauth_init_fini);

clang/lib/Driver/ToolChains/Linux.h

@@ -74,6 +74,8 @@ class LLVM_LIBRARY_VISIBILITY Linux : public Generic_ELF {
   Tool *buildAssembler() const override;
   Tool *buildLinker() const override;
   Tool *buildStaticLibTool() const override;
+  void addPointerAuthFlags(const llvm::opt::ArgList &DriverArgs,
+                           llvm::opt::ArgStringList &CC1Args) const override;
 };
 
 } // end namespace toolchains