Skip to content

Commit 68fd69a

Browse files
committed
[clang][NFC] Convert Sema::PointerAuthDiscArgKind to scoped enum
1 parent ade1203 commit 68fd69a

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

clang/include/clang/Sema/Sema.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,14 @@ enum class NameClassificationKind {
564564
Concept,
565565
};
566566

567+
enum class PointerAuthDiscArgKind {
568+
// Address discrimination argument of __ptrauth.
569+
Addr,
570+
571+
// Extra discriminator argument of __ptrauth.
572+
Extra,
573+
};
574+
567575
/// Sema - This implements semantic analysis and AST building for C.
568576
/// \nosubgrouping
569577
class Sema final : public SemaBase {
@@ -3580,14 +3588,6 @@ class Sema final : public SemaBase {
35803588

35813589
bool checkConstantPointerAuthKey(Expr *keyExpr, unsigned &key);
35823590

3583-
enum PointerAuthDiscArgKind {
3584-
// Address discrimination argument of __ptrauth.
3585-
PADAK_AddrDiscPtrAuth,
3586-
3587-
// Extra discriminator argument of __ptrauth.
3588-
PADAK_ExtraDiscPtrAuth,
3589-
};
3590-
35913591
bool checkPointerAuthDiscriminatorArg(Expr *Arg, PointerAuthDiscArgKind Kind,
35923592
unsigned &IntVal);
35933593

clang/lib/Sema/SemaChecking.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,11 +1569,11 @@ bool Sema::checkPointerAuthDiscriminatorArg(Expr *Arg,
15691569
bool IsAddrDiscArg = false;
15701570

15711571
switch (Kind) {
1572-
case PADAK_AddrDiscPtrAuth:
1572+
case PointerAuthDiscArgKind::Addr:
15731573
Max = 1;
15741574
IsAddrDiscArg = true;
15751575
break;
1576-
case PADAK_ExtraDiscPtrAuth:
1576+
case PointerAuthDiscArgKind::Extra:
15771577
Max = PointerAuthQualifier::MaxDiscriminator;
15781578
break;
15791579
};

clang/lib/Sema/SemaType.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8369,10 +8369,10 @@ static void HandlePtrAuthQualifier(ASTContext &Ctx, QualType &T,
83698369
bool IsInvalid = false;
83708370
unsigned IsAddressDiscriminated, ExtraDiscriminator;
83718371
IsInvalid |= !S.checkPointerAuthDiscriminatorArg(IsAddressDiscriminatedArg,
8372-
Sema::PADAK_AddrDiscPtrAuth,
8372+
PointerAuthDiscArgKind::Addr,
83738373
IsAddressDiscriminated);
83748374
IsInvalid |= !S.checkPointerAuthDiscriminatorArg(
8375-
ExtraDiscriminatorArg, Sema::PADAK_ExtraDiscPtrAuth, ExtraDiscriminator);
8375+
ExtraDiscriminatorArg, PointerAuthDiscArgKind::Extra, ExtraDiscriminator);
83768376

83778377
if (IsInvalid) {
83788378
Attr.setInvalid();

0 commit comments

Comments
 (0)