Skip to content

Commit 3b3ae37

Browse files
ahmedbougachaahmedbougacha
committed
Address some formatting.
1 parent fe12693 commit 3b3ae37

File tree

2 files changed

+52
-36
lines changed

2 files changed

+52
-36
lines changed

‎clang/lib/CodeGen/CGBuiltin.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4969,7 +4969,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
49694969
case Builtin::BI__builtin_ptrauth_sign_unauthenticated:
49704970
case Builtin::BI__builtin_ptrauth_strip: {
49714971
// Emit the arguments.
4972-
SmallVector<llvm::Value*, 5> Args;
4972+
SmallVector<llvm::Value *, 5> Args;
49734973
for (auto argExpr : E->arguments())
49744974
Args.push_back(EmitScalarExpr(argExpr));
49754975

@@ -4979,25 +4979,25 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
49794979
Args[0] = Builder.CreatePtrToInt(Args[0], IntPtrTy);
49804980

49814981
switch (BuiltinID) {
4982-
case Builtin::BI__builtin_ptrauth_auth_and_resign:
4983-
if (Args[4]->getType()->isPointerTy())
4984-
Args[4] = Builder.CreatePtrToInt(Args[4], IntPtrTy);
4985-
LLVM_FALLTHROUGH;
4986-
4987-
case Builtin::BI__builtin_ptrauth_auth:
4988-
case Builtin::BI__builtin_ptrauth_sign_unauthenticated:
4989-
if (Args[2]->getType()->isPointerTy())
4990-
Args[2] = Builder.CreatePtrToInt(Args[2], IntPtrTy);
4991-
break;
4982+
case Builtin::BI__builtin_ptrauth_auth_and_resign:
4983+
if (Args[4]->getType()->isPointerTy())
4984+
Args[4] = Builder.CreatePtrToInt(Args[4], IntPtrTy);
4985+
LLVM_FALLTHROUGH;
4986+
4987+
case Builtin::BI__builtin_ptrauth_auth:
4988+
case Builtin::BI__builtin_ptrauth_sign_unauthenticated:
4989+
if (Args[2]->getType()->isPointerTy())
4990+
Args[2] = Builder.CreatePtrToInt(Args[2], IntPtrTy);
4991+
break;
49924992

4993-
case Builtin::BI__builtin_ptrauth_sign_generic_data:
4994-
if (Args[1]->getType()->isPointerTy())
4995-
Args[1] = Builder.CreatePtrToInt(Args[1], IntPtrTy);
4996-
break;
4993+
case Builtin::BI__builtin_ptrauth_sign_generic_data:
4994+
if (Args[1]->getType()->isPointerTy())
4995+
Args[1] = Builder.CreatePtrToInt(Args[1], IntPtrTy);
4996+
break;
49974997

4998-
case Builtin::BI__builtin_ptrauth_blend_discriminator:
4999-
case Builtin::BI__builtin_ptrauth_strip:
5000-
break;
4998+
case Builtin::BI__builtin_ptrauth_blend_discriminator:
4999+
case Builtin::BI__builtin_ptrauth_strip:
5000+
break;
50015001
}
50025002

50035003
// Call the intrinsic.

‎clang/lib/Sema/SemaChecking.cpp

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,10 +1972,15 @@ static bool SemaOpenCLBuiltinToAddr(Sema &S, unsigned BuiltinID,
19721972
}
19731973

19741974
namespace {
1975-
enum PointerAuthOpKind {
1976-
PAO_Strip, PAO_Sign, PAO_Auth, PAO_SignGeneric, PAO_Discriminator,
1977-
PAO_BlendPointer, PAO_BlendInteger
1978-
};
1975+
enum PointerAuthOpKind {
1976+
PAO_Strip,
1977+
PAO_Sign,
1978+
PAO_Auth,
1979+
PAO_SignGeneric,
1980+
PAO_Discriminator,
1981+
PAO_BlendPointer,
1982+
PAO_BlendInteger
1983+
};
19791984
}
19801985

19811986
static bool checkPointerAuthEnabled(Sema &S, Expr *E) {
@@ -2010,7 +2015,8 @@ bool Sema::checkConstantPointerAuthKey(Expr *Arg, unsigned &Result) {
20102015

20112016
// Ask the target to validate the key parameter.
20122017
if (!Context.getTargetInfo().validatePointerAuthKey(*KeyValue)) {
2013-
llvm::SmallString<32> Value; {
2018+
llvm::SmallString<32> Value;
2019+
{
20142020
llvm::raw_svector_ostream Str(Value);
20152021
Str << *KeyValue;
20162022
}
@@ -2028,16 +2034,16 @@ static bool checkPointerAuthValue(Sema &S, Expr *&Arg,
20282034
PointerAuthOpKind OpKind) {
20292035
if (Arg->hasPlaceholderType()) {
20302036
ExprResult R = S.CheckPlaceholderExpr(Arg);
2031-
if (R.isInvalid()) return true;
2037+
if (R.isInvalid())
2038+
return true;
20322039
Arg = R.get();
20332040
}
20342041

20352042
auto AllowsPointer = [](PointerAuthOpKind OpKind) {
20362043
return OpKind != PAO_BlendInteger;
20372044
};
20382045
auto AllowsInteger = [](PointerAuthOpKind OpKind) {
2039-
return OpKind == PAO_Discriminator ||
2040-
OpKind == PAO_BlendInteger ||
2046+
return OpKind == PAO_Discriminator || OpKind == PAO_BlendInteger ||
20412047
OpKind == PAO_SignGeneric;
20422048
};
20432049

@@ -2082,8 +2088,10 @@ static bool checkPointerAuthValue(Sema &S, Expr *&Arg,
20822088
}
20832089

20842090
static ExprResult SemaPointerAuthStrip(Sema &S, CallExpr *Call) {
2085-
if (checkArgCount(S, Call, 2)) return ExprError();
2086-
if (checkPointerAuthEnabled(S, Call)) return ExprError();
2091+
if (checkArgCount(S, Call, 2))
2092+
return ExprError();
2093+
if (checkPointerAuthEnabled(S, Call))
2094+
return ExprError();
20872095
if (checkPointerAuthValue(S, Call->getArgs()[0], PAO_Strip) ||
20882096
checkPointerAuthKey(S, Call->getArgs()[1]))
20892097
return ExprError();
@@ -2093,8 +2101,10 @@ static ExprResult SemaPointerAuthStrip(Sema &S, CallExpr *Call) {
20932101
}
20942102

20952103
static ExprResult SemaPointerAuthBlendDiscriminator(Sema &S, CallExpr *Call) {
2096-
if (checkArgCount(S, Call, 2)) return ExprError();
2097-
if (checkPointerAuthEnabled(S, Call)) return ExprError();
2104+
if (checkArgCount(S, Call, 2))
2105+
return ExprError();
2106+
if (checkPointerAuthEnabled(S, Call))
2107+
return ExprError();
20982108
if (checkPointerAuthValue(S, Call->getArgs()[0], PAO_BlendPointer) ||
20992109
checkPointerAuthValue(S, Call->getArgs()[1], PAO_BlendInteger))
21002110
return ExprError();
@@ -2104,8 +2114,10 @@ static ExprResult SemaPointerAuthBlendDiscriminator(Sema &S, CallExpr *Call) {
21042114
}
21052115

21062116
static ExprResult SemaPointerAuthSignGenericData(Sema &S, CallExpr *Call) {
2107-
if (checkArgCount(S, Call, 2)) return ExprError();
2108-
if (checkPointerAuthEnabled(S, Call)) return ExprError();
2117+
if (checkArgCount(S, Call, 2))
2118+
return ExprError();
2119+
if (checkPointerAuthEnabled(S, Call))
2120+
return ExprError();
21092121
if (checkPointerAuthValue(S, Call->getArgs()[0], PAO_SignGeneric) ||
21102122
checkPointerAuthValue(S, Call->getArgs()[1], PAO_Discriminator))
21112123
return ExprError();
@@ -2116,8 +2128,10 @@ static ExprResult SemaPointerAuthSignGenericData(Sema &S, CallExpr *Call) {
21162128

21172129
static ExprResult SemaPointerAuthSignOrAuth(Sema &S, CallExpr *Call,
21182130
PointerAuthOpKind OpKind) {
2119-
if (checkArgCount(S, Call, 3)) return ExprError();
2120-
if (checkPointerAuthEnabled(S, Call)) return ExprError();
2131+
if (checkArgCount(S, Call, 3))
2132+
return ExprError();
2133+
if (checkPointerAuthEnabled(S, Call))
2134+
return ExprError();
21212135
if (checkPointerAuthValue(S, Call->getArgs()[0], OpKind) ||
21222136
checkPointerAuthKey(S, Call->getArgs()[1]) ||
21232137
checkPointerAuthValue(S, Call->getArgs()[2], PAO_Discriminator))
@@ -2128,8 +2142,10 @@ static ExprResult SemaPointerAuthSignOrAuth(Sema &S, CallExpr *Call,
21282142
}
21292143

21302144
static ExprResult SemaPointerAuthAuthAndResign(Sema &S, CallExpr *Call) {
2131-
if (checkArgCount(S, Call, 5)) return ExprError();
2132-
if (checkPointerAuthEnabled(S, Call)) return ExprError();
2145+
if (checkArgCount(S, Call, 5))
2146+
return ExprError();
2147+
if (checkPointerAuthEnabled(S, Call))
2148+
return ExprError();
21332149
if (checkPointerAuthValue(S, Call->getArgs()[0], PAO_Auth) ||
21342150
checkPointerAuthKey(S, Call->getArgs()[1]) ||
21352151
checkPointerAuthValue(S, Call->getArgs()[2], PAO_Discriminator) ||

0 commit comments

Comments
 (0)