Clarify warning message, add to group

Author: atrosinenko

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -536,7 +536,8 @@ def err_pauth_cpu_feature_missing : Error<
   "neither FEAT_PAUTH nor -fptrauth-soft is enabled. Most of PAuth features are unavailable">;
 
 def warn_pauth_feature_ignored : Warning<
-  "%0 is ignored because %1 is not specified">;
+  "%0 is ignored because neither -fptrauth-calls nor -mbranch-protection=pauthabi is specified">,
+  InGroup<OptionIgnored>;
 
 def err_cmse_pi_are_incompatible : Error<
   "cmse is not compatible with %select{RWPI|ROPI}0">;

clang/lib/Basic/Targets/AArch64.cpp

@@ -203,24 +203,20 @@ AArch64TargetInfo::AArch64TargetInfo(const llvm::Triple &Triple,
 void AArch64TargetInfo::validatePAuthOptions(DiagnosticsEngine &Diags,
                                              const LangOptions &Opts) const {
   if (!Opts.PointerAuthCalls) {
-    auto IgnoredWithoutPtrAuthCalls = [&Diags](const StringRef OptString) {
-      Diags.Report(diag::warn_pauth_feature_ignored)
-          << OptString << "-fptrauth-calls";
-    };
-
     if (Opts.PointerAuthInitFini)
-      IgnoredWithoutPtrAuthCalls("-fptrauth-init-fini");
+      Diags.Report(diag::warn_pauth_feature_ignored) << "-fptrauth-init-fini";
     if (Opts.FunctionPointerTypeDiscrimination)
-      IgnoredWithoutPtrAuthCalls(
-          "-fptrauth-function-pointer-type-discrimination");
+      Diags.Report(diag::warn_pauth_feature_ignored) <<
+          "-fptrauth-function-pointer-type-discrimination";
     if (Opts.PointerAuthVTPtrAddressDiscrimination)
-      IgnoredWithoutPtrAuthCalls(
-          "-fptrauth-vtable-pointer-address-discrimination");
+      Diags.Report(diag::warn_pauth_feature_ignored) <<
+          "-fptrauth-vtable-pointer-address-discrimination";
     if (Opts.PointerAuthVTPtrTypeDiscrimination)
-      IgnoredWithoutPtrAuthCalls(
-          "-fptrauth-vtable-pointer-type-discrimination");
+      Diags.Report(diag::warn_pauth_feature_ignored) <<
+          "-fptrauth-vtable-pointer-type-discrimination";
     if (Opts.PointerAuthBlockDescriptorPointers)
-      IgnoredWithoutPtrAuthCalls("-fptrauth-block-descriptor-pointers");
+      Diags.Report(diag::warn_pauth_feature_ignored) <<
+          "-fptrauth-block-descriptor-pointers";
   }
 
   if (HasPAuth || Opts.SoftPointerAuth)

clang/test/CodeGen/ptrauth-cpu-feature.c

@@ -50,7 +50,7 @@ int g(int (^bptr)(int)) {
 // Ideally, this should be fixed, but it seems rather harmless.
 //
 // FAIL-COUNT-2: error: neither FEAT_PAUTH nor -fptrauth-soft is enabled. Most of PAuth features are unavailable
-// WARN-COUNT-2: warning: [[OPTION]] is ignored because -fptrauth-calls is not specified
+// WARN-COUNT-2: warning: [[OPTION]] is ignored because neither -fptrauth-calls nor -mbranch-protection=pauthabi is specified
 
 // COMPAT: f:
 // COMPAT:   hint {{#25|#27}}