Check the original LangOptions instead of CodeGenOptions

Author: atrosinenko

clang/lib/Basic/Targets/AArch64.cpp

@@ -202,31 +202,25 @@ AArch64TargetInfo::AArch64TargetInfo(const llvm::Triple &Triple,
 }
 
 void AArch64TargetInfo::validatePAuthOptions(
-    DiagnosticsEngine &Diags, const CodeGenOptions &CGOpts) const {
-  auto NeedsHWSupport = [](const PointerAuthSchema &Schema) {
-    switch (Schema.getKind()) {
-    case PointerAuthSchema::Kind::None:
-    case PointerAuthSchema::Kind::Soft:
-      return false;
-    case PointerAuthSchema::Kind::ARM8_3:
-      return true;
-    }
-    llvm_unreachable("Unexpected authentication kind");
-  };
+    DiagnosticsEngine &Diags, const LangOptions &Opts) const {
+  if (Opts.SoftPointerAuth)
+    return;
 
   bool NeedsFeatPAuth = false;
-  NeedsFeatPAuth |= CGOpts.PointerAuth.ReturnAddresses;
-  for (auto Schema : CGOpts.PointerAuth.getAllUsedSchemas())
-    NeedsFeatPAuth |= NeedsHWSupport(Schema);
+  // FIXME: Some ptrauth_* intrinsics can be implemented without FEAT_PAuth.
+  //        At now, checking conservatively.
+  NeedsFeatPAuth |= Opts.PointerAuthIntrinsics;
+  NeedsFeatPAuth |= Opts.PointerAuthCalls;
+  NeedsFeatPAuth |= Opts.PointerAuthReturns;
+  NeedsFeatPAuth |= Opts.getPointerAuthObjcIsaAuthentication() != PointerAuthenticationMode::None;
 
   if (NeedsFeatPAuth && !HasPAuth)
     Diags.Report(diag::err_pauth_cpu_feature_missing);
 }
 
-void AArch64TargetInfo::adjustTargetOptions(DiagnosticsEngine &Diags,
-                                            const CodeGenOptions &CGOpts,
-                                            TargetOptions &TargetOpts) const {
-  validatePAuthOptions(Diags, CGOpts);
+void AArch64TargetInfo::adjust(DiagnosticsEngine &Diags, LangOptions &Opts) {
+  TargetInfo::adjust(Diags, Opts);
+  validatePAuthOptions(Diags, Opts);
 }
 
 StringRef AArch64TargetInfo::getABI() const { return ABI; }

clang/lib/Basic/Targets/AArch64.h

@@ -92,10 +92,8 @@ class LLVM_LIBRARY_VISIBILITY AArch64TargetInfo : public TargetInfo {
   AArch64TargetInfo(const llvm::Triple &Triple, const TargetOptions &Opts);
 
   void validatePAuthOptions(DiagnosticsEngine &Diags,
-                            const CodeGenOptions &CGOpts) const;
-  void adjustTargetOptions(DiagnosticsEngine &Diags,
-                           const CodeGenOptions &CGOpts,
-                           TargetOptions &TargetOpts) const override;
+                            const LangOptions &Opts) const;
+  void adjust(DiagnosticsEngine &Diags, LangOptions &Opts) override;
 
   StringRef getABI() const override;
   bool setABI(const std::string &Name) override;

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

@@ -1,21 +1,32 @@
-// Test that features requiring FEAT_PAuth fail early:
+// REQUIRES: aarch64-registered-target
+
+// Test that features requiring FEAT_PAuth fail early if the requirement is not met:
+//
 // RUN: not %clang %s -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -mbranch-protection=pauthabi 2>&1 | FileCheck %s --check-prefix=FAIL
 // RUN: not %clang %s -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-calls              2>&1 | FileCheck %s --check-prefix=FAIL
 // RUN: not %clang %s -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-returns            2>&1 | FileCheck %s --check-prefix=FAIL
 // RUN: not %clang %s -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-objc-isa           2>&1 | FileCheck %s --check-prefix=FAIL
 //
-// Note: at the time of writing, the following options are gated on -fptrauth-calls:
-// -fptrauth-init-fini
-// -fptrauth-function-pointer-type-discrimination
-// -fptrauth-vtable-pointer-address-discrimination
-// -fptrauth-vtable-pointer-type-discrimination
-// -fptrauth-block-descriptor-pointers
+// RUN:     %clang %s -S -o - -target aarch64-linux-gnu -mcpu=apple-a12  -mbranch-protection=pauthabi 2>&1 | FileCheck %s --check-prefix=PAUTH
+
+// Test that the following options are still gated on -fptrauth-calls.
+// If they are not, in assertion builds they would fail at asm printing time:
+//
+// RUN: %clang -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-init-fini
+// RUN: %clang -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-function-pointer-type-discrimination
+// RUN: %clang -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-vtable-pointer-address-discrimination
+// RUN: %clang -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-vtable-pointer-type-discrimination
+// RUN: %clang -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -fptrauth-block-descriptor-pointers
 
 // Test that v8.2-compatible code is generated, if possible:
+//
+// RUN: %clang %s -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -msign-return-address=all 2>&1 | FileCheck %s --check-prefix=COMPAT
 // RUN: %clang %s -S -o - -target aarch64-linux-gnu -mcpu=cortex-a72 -mbranch-protection=pac-ret 2>&1 | FileCheck %s --check-prefix=COMPAT
 
-// Several targets imply +pauth:
-// RUN: %clang %s -S -o - -target arm64e-apple-ios 2>&1 | FileCheck %s --check-prefix=PAUTH
+// arm64e has ptrauth enabled and assumes modern enough CPU by default:
+//
+// RUN:     %clang %s -S -o - -target arm64e-apple-ios                  2>&1 | FileCheck %s --check-prefix=PAUTH
+// RUN: not %clang %s -S -o - -target arm64e-apple-ios -mcpu=cortex-a72 2>&1 | FileCheck %s --check-prefix=FAIL
 
 void ext(void);
 
@@ -24,7 +35,10 @@ int f(void) {
   return 0;
 }
 
-// FAIL: error: A feature is requested that needs CPU with Pointer Authentication support
+// FIXME At now, the error message is printed twice.
+// Ideally, this should be fixed, but it seems rather harmless.
+//
+// FAIL-2: error: A feature is requested that needs CPU with Pointer Authentication support
 
 // COMPAT: f:
 // COMPAT:   hint #25