[clang] 68fd69a - [clang][NFC] Convert `Sema::PointerAuthDiscArgKind` to scoped enum

[Vlad Serebrennikov via cfe-commits]

Author: Vlad Serebrennikov
Date: 2025-05-02T07:33:52+03:00
New Revision: 68fd69aca6c9d8129cd5dc27829a8abebea4cefc

URL: https://github.com/llvm/llvm-project/commit/68fd69aca6c9d8129cd5dc27829a8abebea4cefc
DIFF: https://github.com/llvm/llvm-project/commit/68fd69aca6c9d8129cd5dc27829a8abebea4cefc.diff

LOG: [clang][NFC] Convert `Sema::PointerAuthDiscArgKind` to scoped enum

Added: 
    

Modified: 
    clang/include/clang/Sema/Sema.h
    clang/lib/Sema/SemaChecking.cpp
    clang/lib/Sema/SemaType.cpp

Removed: 
    


################################################################################
diff  --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
index 14f9304b99030..f3d03ea0d737a 100644
--- a/clang/include/clang/Sema/Sema.h
+++ b/clang/include/clang/Sema/Sema.h
@@ -564,6 +564,14 @@ enum class NameClassificationKind {
   Concept,
 };
 
+enum class PointerAuthDiscArgKind {
+  // Address discrimination argument of __ptrauth.
+  Addr,
+
+  // Extra discriminator argument of __ptrauth.
+  Extra,
+};
+
 /// Sema - This implements semantic analysis and AST building for C.
 /// \nosubgrouping
 class Sema final : public SemaBase {
@@ -3580,14 +3588,6 @@ class Sema final : public SemaBase {
 
   bool checkConstantPointerAuthKey(Expr *keyExpr, unsigned &key);
 
-  enum PointerAuthDiscArgKind {
-    // Address discrimination argument of __ptrauth.
-    PADAK_AddrDiscPtrAuth,
-
-    // Extra discriminator argument of __ptrauth.
-    PADAK_ExtraDiscPtrAuth,
-  };
-
   bool checkPointerAuthDiscriminatorArg(Expr *Arg, PointerAuthDiscArgKind Kind,
                                         unsigned &IntVal);
 

diff  --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index 92ec2fec519b1..fe80eea61f6d3 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -1569,11 +1569,11 @@ bool Sema::checkPointerAuthDiscriminatorArg(Expr *Arg,
   bool IsAddrDiscArg = false;
 
   switch (Kind) {
-  case PADAK_AddrDiscPtrAuth:
+  case PointerAuthDiscArgKind::Addr:
     Max = 1;
     IsAddrDiscArg = true;
     break;
-  case PADAK_ExtraDiscPtrAuth:
+  case PointerAuthDiscArgKind::Extra:
     Max = PointerAuthQualifier::MaxDiscriminator;
     break;
   };

diff  --git a/clang/lib/Sema/SemaType.cpp b/clang/lib/Sema/SemaType.cpp
index 444b8d9ee28b4..d103a10f17a71 100644
--- a/clang/lib/Sema/SemaType.cpp
+++ b/clang/lib/Sema/SemaType.cpp
@@ -8369,10 +8369,10 @@ static void HandlePtrAuthQualifier(ASTContext &Ctx, QualType &T,
   bool IsInvalid = false;
   unsigned IsAddressDiscriminated, ExtraDiscriminator;
   IsInvalid |= !S.checkPointerAuthDiscriminatorArg(IsAddressDiscriminatedArg,
-                                                   Sema::PADAK_AddrDiscPtrAuth,
+                                                   PointerAuthDiscArgKind::Addr,
                                                    IsAddressDiscriminated);
   IsInvalid |= !S.checkPointerAuthDiscriminatorArg(
-      ExtraDiscriminatorArg, Sema::PADAK_ExtraDiscPtrAuth, ExtraDiscriminator);
+      ExtraDiscriminatorArg, PointerAuthDiscArgKind::Extra, ExtraDiscriminator);
 
   if (IsInvalid) {
     Attr.setInvalid();