Skip to content

Commit 1c26eb3

Browse files
SirraideSirraide
committed
clang-format
1 parent 4caca7a commit 1c26eb3

28 files changed

+138
-87
lines changed

‎clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,7 +1232,8 @@ StyleKind IdentifierNamingCheck::findStyleKind(
12321232
if (Decl->isParameterPack() && NamingStyles[SK_ParameterPack])
12331233
return SK_ParameterPack;
12341234

1235-
if (!Type.isNull() && Type.getTypePtr()->isPointerOrObjCObjectPointerType() &&
1235+
if (!Type.isNull() &&
1236+
Type.getTypePtr()->isPointerOrObjCObjectPointerType() &&
12361237
NamingStyles[SK_PointerParameter])
12371238
return SK_PointerParameter;
12381239

@@ -1508,7 +1509,8 @@ StyleKind IdentifierNamingCheck::findStyleKindForVar(
15081509
if (Var->isStaticDataMember() && NamingStyles[SK_ClassConstant])
15091510
return SK_ClassConstant;
15101511

1511-
if (Var->isFileVarDecl() && Type.getTypePtr()->isPointerOrObjCObjectPointerType() &&
1512+
if (Var->isFileVarDecl() &&
1513+
Type.getTypePtr()->isPointerOrObjCObjectPointerType() &&
15121514
NamingStyles[SK_GlobalConstantPointer])
15131515
return SK_GlobalConstantPointer;
15141516

@@ -1518,7 +1520,8 @@ StyleKind IdentifierNamingCheck::findStyleKindForVar(
15181520
if (Var->isStaticLocal() && NamingStyles[SK_StaticConstant])
15191521
return SK_StaticConstant;
15201522

1521-
if (Var->isLocalVarDecl() && Type.getTypePtr()->isPointerOrObjCObjectPointerType() &&
1523+
if (Var->isLocalVarDecl() &&
1524+
Type.getTypePtr()->isPointerOrObjCObjectPointerType() &&
15221525
NamingStyles[SK_LocalConstantPointer])
15231526
return SK_LocalConstantPointer;
15241527

@@ -1535,7 +1538,8 @@ StyleKind IdentifierNamingCheck::findStyleKindForVar(
15351538
if (Var->isStaticDataMember() && NamingStyles[SK_ClassMember])
15361539
return SK_ClassMember;
15371540

1538-
if (Var->isFileVarDecl() && Type.getTypePtr()->isPointerOrObjCObjectPointerType() &&
1541+
if (Var->isFileVarDecl() &&
1542+
Type.getTypePtr()->isPointerOrObjCObjectPointerType() &&
15391543
NamingStyles[SK_GlobalPointer])
15401544
return SK_GlobalPointer;
15411545

@@ -1545,7 +1549,8 @@ StyleKind IdentifierNamingCheck::findStyleKindForVar(
15451549
if (Var->isStaticLocal() && NamingStyles[SK_StaticVariable])
15461550
return SK_StaticVariable;
15471551

1548-
if (Var->isLocalVarDecl() && Type.getTypePtr()->isPointerOrObjCObjectPointerType() &&
1552+
if (Var->isLocalVarDecl() &&
1553+
Type.getTypePtr()->isPointerOrObjCObjectPointerType() &&
15491554
NamingStyles[SK_LocalPointer])
15501555
return SK_LocalPointer;
15511556

‎clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,8 @@ static bool areTypesCompatible(QualType ArgType, QualType ParamType,
472472

473473
// Unless argument and param are both multilevel pointers, the types are not
474474
// convertible.
475-
if (!(ParamType->isPointerOrObjCObjectPointerType() && ArgType->isPointerOrObjCObjectPointerType()))
475+
if (!(ParamType->isPointerOrObjCObjectPointerType() &&
476+
ArgType->isPointerOrObjCObjectPointerType()))
476477
return false;
477478

478479
return arePointerTypesCompatible(ArgType, ParamType, IsParamContinuouslyConst,

‎clang/include/clang/AST/Type.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2536,7 +2536,8 @@ class alignas(TypeAlignment) Type : public ExtQualsTypeCommonBase {
25362536
bool isPointerType() const;
25372537
bool isPointerOrReferenceType() const;
25382538
bool isSignableType() const;
2539-
bool isPointerOrObjCObjectPointerType() const; // Any C pointer or ObjC object pointer
2539+
bool isPointerOrObjCObjectPointerType()
2540+
const; // Any C pointer or ObjC object pointer
25402541
bool isCountAttributedType() const;
25412542
bool isBlockPointerType() const;
25422543
bool isVoidPointerType() const;
@@ -8656,8 +8657,8 @@ inline bool Type::isUndeducedType() const {
86568657
inline bool Type::isOverloadableType() const {
86578658
if (!isDependentType())
86588659
return isRecordType() || isEnumeralType();
8659-
return !isArrayType() && !isFunctionType() && !isPointerOrObjCObjectPointerType() &&
8660-
!isMemberPointerType();
8660+
return !isArrayType() && !isFunctionType() &&
8661+
!isPointerOrObjCObjectPointerType() && !isMemberPointerType();
86618662
}
86628663

86638664
/// Determines whether this type is written as a typedef-name.

‎clang/include/clang/StaticAnalyzer/Core/PathSensitive/SMTConv.h‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,8 @@ class SMTConv {
264264
uint64_t FromBitWidth) {
265265
if ((FromTy->isIntegralOrEnumerationType() &&
266266
ToTy->isIntegralOrEnumerationType()) ||
267-
(FromTy->isPointerOrObjCObjectPointerType() ^ ToTy->isPointerOrObjCObjectPointerType()) ||
267+
(FromTy->isPointerOrObjCObjectPointerType() ^
268+
ToTy->isPointerOrObjCObjectPointerType()) ||
268269
(FromTy->isBlockPointerType() ^ ToTy->isBlockPointerType()) ||
269270
(FromTy->isReferenceType() ^ ToTy->isReferenceType())) {
270271

@@ -365,7 +366,8 @@ class SMTConv {
365366

366367
// If the two operands are pointers and the operation is a subtraction,
367368
// the result is of type ptrdiff_t, which is signed
368-
if (LTy->isPointerOrObjCObjectPointerType() && RTy->isPointerOrObjCObjectPointerType() && Op == BO_Sub) {
369+
if (LTy->isPointerOrObjCObjectPointerType() &&
370+
RTy->isPointerOrObjCObjectPointerType() && Op == BO_Sub) {
369371
*RetTy = Ctx.getPointerDiffType();
370372
}
371373
}
@@ -509,8 +511,9 @@ class SMTConv {
509511
Solver->mkFloat(Zero));
510512
}
511513

512-
if (Ty->isIntegralOrEnumerationType() || Ty->isPointerOrObjCObjectPointerType() ||
513-
Ty->isBlockPointerType() || Ty->isReferenceType()) {
514+
if (Ty->isIntegralOrEnumerationType() ||
515+
Ty->isPointerOrObjCObjectPointerType() || Ty->isBlockPointerType() ||
516+
Ty->isReferenceType()) {
514517

515518
// Skip explicit comparison for boolean types
516519
bool isSigned = Ty->isSignedIntegerOrEnumerationType();
@@ -613,7 +616,8 @@ class SMTConv {
613616
return;
614617
}
615618

616-
if ((LTy->isPointerOrObjCObjectPointerType() || RTy->isPointerOrObjCObjectPointerType()) ||
619+
if ((LTy->isPointerOrObjCObjectPointerType() ||
620+
RTy->isPointerOrObjCObjectPointerType()) ||
617621
(LTy->isBlockPointerType() || RTy->isBlockPointerType()) ||
618622
(LTy->isReferenceType() || RTy->isReferenceType())) {
619623
// TODO: Refactor to Sema::FindCompositePointerType(), and
@@ -624,7 +628,8 @@ class SMTConv {
624628

625629
// Cast the non-pointer type to the pointer type.
626630
// TODO: Be more strict about this.
627-
if ((LTy->isPointerOrObjCObjectPointerType() ^ RTy->isPointerOrObjCObjectPointerType()) ||
631+
if ((LTy->isPointerOrObjCObjectPointerType() ^
632+
RTy->isPointerOrObjCObjectPointerType()) ||
628633
(LTy->isBlockPointerType() ^ RTy->isBlockPointerType()) ||
629634
(LTy->isReferenceType() ^ RTy->isReferenceType())) {
630635
if (LTy->isNullPtrType() || LTy->isBlockPointerType() ||

‎clang/lib/AST/ASTContext.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2981,8 +2981,8 @@ bool ASTContext::isSentinelNullExpr(const Expr *E) {
29812981
if (E->getType()->isNullPtrType()) return true;
29822982

29832983
if (E->getType()->isPointerOrObjCObjectPointerType() &&
2984-
E->IgnoreParenCasts()->isNullPointerConstant(*this,
2985-
Expr::NPC_ValueDependentIsNull))
2984+
E->IgnoreParenCasts()->isNullPointerConstant(
2985+
*this, Expr::NPC_ValueDependentIsNull))
29862986
return true;
29872987

29882988
// Unfortunately, __null has type 'int'.

‎clang/lib/AST/MicrosoftMangle.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2570,8 +2570,9 @@ void MicrosoftCXXNameMangler::mangleType(QualType T, SourceRange Range,
25702570
return;
25712571
}
25722572

2573-
bool IsPointer = T->isPointerOrObjCObjectPointerType() || T->isMemberPointerType() ||
2574-
T->isReferenceType() || T->isBlockPointerType();
2573+
bool IsPointer = T->isPointerOrObjCObjectPointerType() ||
2574+
T->isMemberPointerType() || T->isReferenceType() ||
2575+
T->isBlockPointerType();
25752576

25762577
switch (QMM) {
25772578
case QMM_Drop:

‎clang/lib/Analysis/UninitializedValues.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,8 @@ void ClassifyRefs::VisitOMPExecutableDirective(OMPExecutableDirective *ED) {
417417
}
418418

419419
static bool isPointerToConst(const QualType &QT) {
420-
return QT->isPointerOrObjCObjectPointerType() && QT->getPointeeType().isConstQualified();
420+
return QT->isPointerOrObjCObjectPointerType() &&
421+
QT->getPointeeType().isConstQualified();
421422
}
422423

423424
static bool hasTrivialBody(CallExpr *CE) {

‎clang/lib/CodeGen/CGCall.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2929,7 +2929,8 @@ static const NonNullAttr *getNonNullAttr(const Decl *FD, const ParmVarDecl *PVD,
29292929
// In the former case, LLVM IR cannot represent the constraint. In
29302930
// the latter case, we have no guarantee that the transparent union
29312931
// is in fact passed as a pointer.
2932-
if (!ArgType->isPointerOrObjCObjectPointerType() && !ArgType->isBlockPointerType())
2932+
if (!ArgType->isPointerOrObjCObjectPointerType() &&
2933+
!ArgType->isBlockPointerType())
29332934
return nullptr;
29342935
// First, check attribute on parameter itself.
29352936
if (PVD) {

‎clang/lib/CodeGen/CGOpenMPRuntime.cpp‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7188,12 +7188,13 @@ class MappableExprsHandler {
71887188
dyn_cast<OMPArrayShapingExpr>(I->getAssociatedExpression());
71897189
const auto *UO = dyn_cast<UnaryOperator>(I->getAssociatedExpression());
71907190
const auto *BO = dyn_cast<BinaryOperator>(I->getAssociatedExpression());
7191-
bool IsPointer =
7192-
OAShE ||
7193-
(OASE && ArraySectionExpr::getBaseOriginalType(OASE)
7194-
.getCanonicalType()
7195-
->isPointerOrObjCObjectPointerType()) ||
7196-
I->getAssociatedExpression()->getType()->isPointerOrObjCObjectPointerType();
7191+
bool IsPointer = OAShE ||
7192+
(OASE && ArraySectionExpr::getBaseOriginalType(OASE)
7193+
.getCanonicalType()
7194+
->isPointerOrObjCObjectPointerType()) ||
7195+
I->getAssociatedExpression()
7196+
->getType()
7197+
->isPointerOrObjCObjectPointerType();
71977198
bool IsMemberReference = isa<MemberExpr>(I->getAssociatedExpression()) &&
71987199
MapDecl &&
71997200
MapDecl->getType()->isLValueReferenceType();
@@ -8533,7 +8534,8 @@ class MappableExprsHandler {
85338534
assert(VDecl == VD && "We got information for the wrong declaration??");
85348535
assert(!Components.empty() &&
85358536
"Not expecting declaration with no component lists.");
8536-
if (VD && E && VD->getType()->isPointerOrObjCObjectPointerType() && isa<DeclRefExpr>(E))
8537+
if (VD && E && VD->getType()->isPointerOrObjCObjectPointerType() &&
8538+
isa<DeclRefExpr>(E))
85378539
HasMapBasePtr = true;
85388540
if (VD && E && VD->getType()->isPointerOrObjCObjectPointerType() &&
85398541
(isa<ArraySectionExpr>(E) || isa<ArraySubscriptExpr>(E)))
@@ -8784,7 +8786,8 @@ class MappableExprsHandler {
87848786
CombinedInfo.BasePointers.push_back(CV);
87858787
CombinedInfo.DevicePtrDecls.push_back(nullptr);
87868788
CombinedInfo.DevicePointers.push_back(DeviceInfoTy::None);
8787-
if (I != FirstPrivateDecls.end() && ElementType->isPointerOrObjCObjectPointerType()) {
8789+
if (I != FirstPrivateDecls.end() &&
8790+
ElementType->isPointerOrObjCObjectPointerType()) {
87888791
Address PtrAddr = CGF.EmitLoadOfReference(CGF.MakeAddrLValue(
87898792
CV, ElementType, CGF.getContext().getDeclAlign(VD),
87908793
AlignmentSource::Decl));

‎clang/lib/CodeGen/CGOpenMPRuntimeGPU.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1962,7 +1962,9 @@ llvm::Function *CGOpenMPRuntimeGPU::createParallelDataSharingWrapper(
19621962
CGFContext.getPointerType(ElemTy),
19631963
CI->getLocation());
19641964
if (CI->capturesVariableByCopy() &&
1965-
!CI->getCapturedVar()->getType()->isPointerOrObjCObjectPointerType()) {
1965+
!CI->getCapturedVar()
1966+
->getType()
1967+
->isPointerOrObjCObjectPointerType()) {
19661968
Arg = castValueToType(CGF, Arg, ElemTy, CGFContext.getUIntPtrType(),
19671969
CI->getLocation());
19681970
}

0 commit comments

Comments
 (0)