Skip to content

Commit a4865de

Browse files
sdkrystiansdkrystian
committed
[FOLD] format
1 parent a421d32 commit a4865de

17 files changed

+222
-303
lines changed

‎clang/include/clang/AST/ExprCXX.h

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3671,11 +3671,9 @@ class CXXUnresolvedConstructExpr final
36713671
/// an implicit access if a qualifier is provided.
36723672
class CXXDependentScopeMemberExpr final
36733673
: public Expr,
3674-
private llvm::TrailingObjects<CXXDependentScopeMemberExpr,
3675-
NestedNameSpecifierLoc,
3676-
DeclAccessPair,
3677-
ASTTemplateKWAndArgsInfo,
3678-
TemplateArgumentLoc> {
3674+
private llvm::TrailingObjects<
3675+
CXXDependentScopeMemberExpr, NestedNameSpecifierLoc, DeclAccessPair,
3676+
ASTTemplateKWAndArgsInfo, TemplateArgumentLoc> {
36793677
friend class ASTStmtReader;
36803678
friend class ASTStmtWriter;
36813679
friend TrailingObjects;
@@ -3751,19 +3749,16 @@ class CXXDependentScopeMemberExpr final
37513749

37523750
public:
37533751
static CXXDependentScopeMemberExpr *
3754-
Create(const ASTContext &Ctx, Expr *Base,
3755-
QualType BaseType, bool IsArrow,
3756-
SourceLocation OperatorLoc,
3757-
NestedNameSpecifierLoc QualifierLoc,
3752+
Create(const ASTContext &Ctx, Expr *Base, QualType BaseType, bool IsArrow,
3753+
SourceLocation OperatorLoc, NestedNameSpecifierLoc QualifierLoc,
37583754
SourceLocation TemplateKWLoc,
37593755
ArrayRef<DeclAccessPair> UnqualifiedLookups,
37603756
DeclarationNameInfo MemberNameInfo,
37613757
const TemplateArgumentListInfo *TemplateArgs);
37623758

37633759
static CXXDependentScopeMemberExpr *
37643760
CreateEmpty(const ASTContext &Ctx, bool HasQualifier,
3765-
unsigned NumUnqualifiedLookups,
3766-
bool HasTemplateKWAndArgsInfo,
3761+
unsigned NumUnqualifiedLookups, bool HasTemplateKWAndArgsInfo,
37673762
unsigned NumTemplateArgs);
37683763

37693764
/// True if this is an implicit access, i.e. one in which the
@@ -3789,9 +3784,7 @@ class CXXDependentScopeMemberExpr final
37893784
bool isArrow() const { return CXXDependentScopeMemberExprBits.IsArrow; }
37903785

37913786
/// Retrieve the location of the '->' or '.' operator.
3792-
SourceLocation getOperatorLoc() const {
3793-
return OperatorLoc;
3794-
}
3787+
SourceLocation getOperatorLoc() const { return OperatorLoc; }
37953788

37963789
/// Determines whether this member expression had a nested-name-specifier
37973790
/// prior to the name of the member, e.g., x->Base::foo.
@@ -3814,8 +3807,7 @@ class CXXDependentScopeMemberExpr final
38143807
return getQualifierLoc().getNestedNameSpecifier();
38153808
}
38163809

3817-
3818-
#if 0
3810+
#if 0
38193811
/// Retrieve the first part of the nested-name-specifier that was
38203812
/// found in the scope of the member access expression when the member access
38213813
/// was initially parsed.
@@ -3832,7 +3824,7 @@ class CXXDependentScopeMemberExpr final
38323824
return nullptr;
38333825
return *getTrailingObjects<NamedDecl *>();
38343826
}
3835-
#endif
3827+
#endif
38363828

38373829
ArrayRef<DeclAccessPair> unqualified_lookups() const {
38383830
if (!getNumUnqualifiedLookups())

‎clang/include/clang/AST/Stmt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,12 +1030,12 @@ class alignas(void *) Stmt {
10301030
LLVM_PREFERRED_TYPE(bool)
10311031
unsigned HasTemplateKWAndArgsInfo : 1;
10321032

1033-
#if 0
1033+
#if 0
10341034
/// See getFirstQualifierFoundInScope() and the comment listing
10351035
/// the trailing objects.
10361036
LLVM_PREFERRED_TYPE(bool)
10371037
unsigned HasFirstQualifierFoundInScope : 1;
1038-
#endif
1038+
#endif
10391039
/// Number of declarations found by unqualified lookup for the
10401040
/// first component name of the nested-name-specifier.
10411041
unsigned NumUnqualifiedLookups;

‎clang/include/clang/Sema/Sema.h

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2390,7 +2390,8 @@ class Sema final : public SemaBase {
23902390

23912391
bool isAcceptableNestedNameSpecifier(const NamedDecl *SD,
23922392
bool *CanCorrect = nullptr);
2393-
bool LookupFirstQualifierInScope(Scope *S, NestedNameSpecifier *NNS, UnresolvedSetImpl &R);
2393+
bool LookupFirstQualifierInScope(Scope *S, NestedNameSpecifier *NNS,
2394+
UnresolvedSetImpl &R);
23942395

23952396
/// Keeps information about an identifier in a nested-name-spec.
23962397
///
@@ -6934,11 +6935,12 @@ class Sema final : public SemaBase {
69346935
const TemplateArgumentListInfo *TemplateArgs,
69356936
bool IsDefiniteInstance, const Scope *S);
69366937

6937-
ExprResult ActOnDependentMemberExpr(
6938-
Expr *Base, QualType BaseType, bool IsArrow, SourceLocation OpLoc,
6939-
const CXXScopeSpec &SS, SourceLocation TemplateKWLoc,
6940-
const DeclarationNameInfo &NameInfo,
6941-
const TemplateArgumentListInfo *TemplateArgs);
6938+
ExprResult
6939+
ActOnDependentMemberExpr(Expr *Base, QualType BaseType, bool IsArrow,
6940+
SourceLocation OpLoc, const CXXScopeSpec &SS,
6941+
SourceLocation TemplateKWLoc,
6942+
const DeclarationNameInfo &NameInfo,
6943+
const TemplateArgumentListInfo *TemplateArgs);
69426944

69436945
ExprResult ActOnMemberAccessExpr(Scope *S, Expr *Base, SourceLocation OpLoc,
69446946
bool IsArrow, CXXScopeSpec &SS,

‎clang/lib/AST/ASTImporter.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8433,7 +8433,6 @@ ExpectedStmt ASTNodeImporter::VisitCXXDependentScopeMemberExpr(
84338433
auto ToQualifierLoc = importChecked(Err, E->getQualifierLoc());
84348434
auto ToTemplateKeywordLoc = importChecked(Err, E->getTemplateKeywordLoc());
84358435

8436-
84378436
UnresolvedSet<8> ToUnqualifiedLookups;
84388437
for (auto D : E->unqualified_lookups())
84398438
if (auto ToDOrErr = import(D.getDecl()))

‎clang/lib/AST/ExprCXX.cpp

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1450,8 +1450,7 @@ CXXDependentScopeMemberExpr::CXXDependentScopeMemberExpr(
14501450
Base(Base), BaseType(BaseType), OperatorLoc(OperatorLoc),
14511451
MemberNameInfo(MemberNameInfo) {
14521452
CXXDependentScopeMemberExprBits.IsArrow = IsArrow;
1453-
CXXDependentScopeMemberExprBits.HasQualifier =
1454-
QualifierLoc.hasQualifier();
1453+
CXXDependentScopeMemberExprBits.HasQualifier = QualifierLoc.hasQualifier();
14551454
CXXDependentScopeMemberExprBits.NumUnqualifiedLookups =
14561455
UnqualifiedLookups.size();
14571456
CXXDependentScopeMemberExprBits.HasTemplateKWAndArgsInfo =
@@ -1462,7 +1461,8 @@ CXXDependentScopeMemberExpr::CXXDependentScopeMemberExpr(
14621461
NestedNameSpecifierLoc(QualifierLoc);
14631462

14641463
std::uninitialized_copy_n(UnqualifiedLookups.data(),
1465-
UnqualifiedLookups.size(), getTrailingObjects<DeclAccessPair>());
1464+
UnqualifiedLookups.size(),
1465+
getTrailingObjects<DeclAccessPair>());
14661466

14671467
if (TemplateArgs) {
14681468
auto Deps = TemplateArgumentDependence::None;
@@ -1482,8 +1482,7 @@ CXXDependentScopeMemberExpr::CXXDependentScopeMemberExpr(
14821482
bool HasTemplateKWAndArgsInfo)
14831483
: Expr(CXXDependentScopeMemberExprClass, Empty) {
14841484
CXXDependentScopeMemberExprBits.HasQualifier = HasQualifier;
1485-
CXXDependentScopeMemberExprBits.NumUnqualifiedLookups =
1486-
NumUnqualifiedLookups;
1485+
CXXDependentScopeMemberExprBits.NumUnqualifiedLookups = NumUnqualifiedLookups;
14871486
CXXDependentScopeMemberExprBits.HasTemplateKWAndArgsInfo =
14881487
HasTemplateKWAndArgsInfo;
14891488
}
@@ -1500,12 +1499,11 @@ CXXDependentScopeMemberExpr *CXXDependentScopeMemberExpr::Create(
15001499
bool HasTemplateKWAndArgsInfo =
15011500
(TemplateArgs != nullptr) || TemplateKWLoc.isValid();
15021501
unsigned NumTemplateArgs = TemplateArgs ? TemplateArgs->size() : 0;
1503-
unsigned Size = totalSizeToAlloc<NestedNameSpecifierLoc,
1504-
DeclAccessPair,
1505-
ASTTemplateKWAndArgsInfo,
1506-
TemplateArgumentLoc>(
1507-
HasQualifier, NumUnqualifiedLookups,
1508-
HasTemplateKWAndArgsInfo, NumTemplateArgs);
1502+
unsigned Size =
1503+
totalSizeToAlloc<NestedNameSpecifierLoc, DeclAccessPair,
1504+
ASTTemplateKWAndArgsInfo, TemplateArgumentLoc>(
1505+
HasQualifier, NumUnqualifiedLookups, HasTemplateKWAndArgsInfo,
1506+
NumTemplateArgs);
15091507

15101508
void *Mem = Ctx.Allocate(Size, alignof(CXXDependentScopeMemberExpr));
15111509
return new (Mem) CXXDependentScopeMemberExpr(
@@ -1519,16 +1517,16 @@ CXXDependentScopeMemberExpr *CXXDependentScopeMemberExpr::CreateEmpty(
15191517
assert(!NumTemplateArgs || HasTemplateKWAndArgsInfo);
15201518
assert(!NumUnqualifiedLookups || HasQualifier);
15211519

1522-
unsigned Size = totalSizeToAlloc<NestedNameSpecifierLoc,
1523-
DeclAccessPair,
1524-
ASTTemplateKWAndArgsInfo,
1525-
TemplateArgumentLoc>(
1526-
HasQualifier, NumUnqualifiedLookups,
1527-
HasTemplateKWAndArgsInfo, NumTemplateArgs);
1520+
unsigned Size =
1521+
totalSizeToAlloc<NestedNameSpecifierLoc, DeclAccessPair,
1522+
ASTTemplateKWAndArgsInfo, TemplateArgumentLoc>(
1523+
HasQualifier, NumUnqualifiedLookups, HasTemplateKWAndArgsInfo,
1524+
NumTemplateArgs);
15281525

15291526
void *Mem = Ctx.Allocate(Size, alignof(CXXDependentScopeMemberExpr));
1530-
return new (Mem) CXXDependentScopeMemberExpr(
1531-
EmptyShell(), HasQualifier, NumUnqualifiedLookups, HasTemplateKWAndArgsInfo);
1527+
return new (Mem) CXXDependentScopeMemberExpr(EmptyShell(), HasQualifier,
1528+
NumUnqualifiedLookups,
1529+
HasTemplateKWAndArgsInfo);
15321530
}
15331531

15341532
CXXThisExpr *CXXThisExpr::Create(const ASTContext &Ctx, SourceLocation L,

‎clang/lib/AST/ItaniumMangle.cpp

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -598,8 +598,7 @@ class CXXNameMangler {
598598
ArrayRef<DeclAccessPair> UnqualifiedLookups,
599599
DeclarationName name,
600600
const TemplateArgumentLoc *TemplateArgs,
601-
unsigned NumTemplateArgs,
602-
unsigned knownArity);
601+
unsigned NumTemplateArgs, unsigned knownArity);
603602
void mangleCastExpression(const Expr *E, StringRef CastEncoding);
604603
void mangleInitListElements(const InitListExpr *InitList);
605604
void mangleRequirement(SourceLocation RequiresExprLoc,
@@ -4491,14 +4490,11 @@ void CXXNameMangler::mangleMemberExprBase(const Expr *Base, bool IsArrow) {
44914490
}
44924491

44934492
/// Mangles a member expression.
4494-
void CXXNameMangler::mangleMemberExpr(const Expr *base,
4495-
bool isArrow,
4496-
NestedNameSpecifier *qualifier,
4497-
ArrayRef<DeclAccessPair> UnqualifiedLookups,
4498-
DeclarationName member,
4499-
const TemplateArgumentLoc *TemplateArgs,
4500-
unsigned NumTemplateArgs,
4501-
unsigned arity) {
4493+
void CXXNameMangler::mangleMemberExpr(
4494+
const Expr *base, bool isArrow, NestedNameSpecifier *qualifier,
4495+
ArrayRef<DeclAccessPair> UnqualifiedLookups, DeclarationName member,
4496+
const TemplateArgumentLoc *TemplateArgs, unsigned NumTemplateArgs,
4497+
unsigned arity) {
45024498
// <expression> ::= dt <expression> <unresolved-name>
45034499
// ::= pt <expression> <unresolved-name>
45044500
if (base)
@@ -4979,11 +4975,9 @@ void CXXNameMangler::mangleExpression(const Expr *E, unsigned Arity,
49794975
case Expr::MemberExprClass: {
49804976
NotPrimaryExpr();
49814977
const MemberExpr *ME = cast<MemberExpr>(E);
4982-
mangleMemberExpr(ME->getBase(), ME->isArrow(),
4983-
ME->getQualifier(), std::nullopt,
4984-
ME->getMemberDecl()->getDeclName(),
4985-
ME->getTemplateArgs(), ME->getNumTemplateArgs(),
4986-
Arity);
4978+
mangleMemberExpr(ME->getBase(), ME->isArrow(), ME->getQualifier(),
4979+
std::nullopt, ME->getMemberDecl()->getDeclName(),
4980+
ME->getTemplateArgs(), ME->getNumTemplateArgs(), Arity);
49874981
break;
49884982
}
49894983

@@ -4992,9 +4986,8 @@ void CXXNameMangler::mangleExpression(const Expr *E, unsigned Arity,
49924986
const UnresolvedMemberExpr *ME = cast<UnresolvedMemberExpr>(E);
49934987
mangleMemberExpr(ME->isImplicitAccess() ? nullptr : ME->getBase(),
49944988
ME->isArrow(), ME->getQualifier(), std::nullopt,
4995-
ME->getMemberName(),
4996-
ME->getTemplateArgs(), ME->getNumTemplateArgs(),
4997-
Arity);
4989+
ME->getMemberName(), ME->getTemplateArgs(),
4990+
ME->getNumTemplateArgs(), Arity);
49984991
break;
49994992
}
50004993

@@ -5004,10 +4997,8 @@ void CXXNameMangler::mangleExpression(const Expr *E, unsigned Arity,
50044997
= cast<CXXDependentScopeMemberExpr>(E);
50054998
mangleMemberExpr(ME->isImplicitAccess() ? nullptr : ME->getBase(),
50064999
ME->isArrow(), ME->getQualifier(),
5007-
ME->unqualified_lookups(),
5008-
ME->getMember(),
5009-
ME->getTemplateArgs(), ME->getNumTemplateArgs(),
5010-
Arity);
5000+
ME->unqualified_lookups(), ME->getMember(),
5001+
ME->getTemplateArgs(), ME->getNumTemplateArgs(), Arity);
50115002
break;
50125003
}
50135004

‎clang/lib/Sema/SemaCXXScopeSpec.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,8 @@ bool Sema::isAcceptableNestedNameSpecifier(const NamedDecl *SD,
390390
/// (e.g., Base::), perform name lookup for that identifier as a
391391
/// nested-name-specifier within the given scope, and return the result of that
392392
/// name lookup.
393-
bool Sema::LookupFirstQualifierInScope(Scope *S, NestedNameSpecifier *NNS, UnresolvedSetImpl &R) {
393+
bool Sema::LookupFirstQualifierInScope(Scope *S, NestedNameSpecifier *NNS,
394+
UnresolvedSetImpl &R) {
394395
if (!S)
395396
return false;
396397

@@ -533,7 +534,7 @@ bool Sema::BuildCXXNestedNameSpecifier(Scope *S, NestedNameSpecInfo &IdInfo,
533534
if (S) {
534535
LookupName(Found, S);
535536
} else if (LookupFirstQualifierInScope &&
536-
!SS.getUnqualifiedLookups().empty()) {
537+
!SS.getUnqualifiedLookups().empty()) {
537538
Found.addAllDecls(SS.getUnqualifiedLookups());
538539
Found.resolveKind();
539540
}

‎clang/lib/Sema/SemaCoroutine.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ static ExprResult buildMemberCall(Sema &S, Expr *Base, SourceLocation Loc,
306306
// FIXME: Fix BuildMemberReferenceExpr to take a const CXXScopeSpec&.
307307
CXXScopeSpec SS;
308308
ExprResult Result = S.BuildMemberReferenceExpr(
309-
Base, Base->getType(), Loc, /*IsPtr=*/false, SS,
310-
SourceLocation(), NameInfo, /*TemplateArgs=*/nullptr,
309+
Base, Base->getType(), Loc, /*IsPtr=*/false, SS, SourceLocation(),
310+
NameInfo, /*TemplateArgs=*/nullptr,
311311
/*Scope=*/nullptr);
312312
if (Result.isInvalid())
313313
return ExprError();

‎clang/lib/Sema/SemaDeclCXX.cpp

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5012,15 +5012,12 @@ BuildImplicitMemberInitializer(Sema &SemaRef, CXXConstructorDecl *Constructor,
50125012
MemberLookup.addDecl(Indirect ? cast<ValueDecl>(Indirect)
50135013
: cast<ValueDecl>(Field), AS_public);
50145014
MemberLookup.resolveKind();
5015-
ExprResult CtorArg
5016-
= SemaRef.BuildMemberReferenceExpr(MemberExprBase,
5017-
ParamType, Loc,
5018-
/*IsArrow=*/false,
5019-
SS,
5020-
/*TemplateKWLoc=*/SourceLocation(),
5021-
MemberLookup,
5022-
/*TemplateArgs=*/nullptr,
5023-
/*S=*/nullptr);
5015+
ExprResult CtorArg = SemaRef.BuildMemberReferenceExpr(
5016+
MemberExprBase, ParamType, Loc,
5017+
/*IsArrow=*/false, SS,
5018+
/*TemplateKWLoc=*/SourceLocation(), MemberLookup,
5019+
/*TemplateArgs=*/nullptr,
5020+
/*S=*/nullptr);
50245021
if (CtorArg.isInvalid())
50255022
return true;
50265023

@@ -14544,9 +14541,10 @@ class MemberBuilder: public ExprBuilder {
1454414541
public:
1454514542
Expr *build(Sema &S, SourceLocation Loc) const override {
1454614543
return assertNotNull(S.BuildMemberReferenceExpr(
14547-
Builder.build(S, Loc), Type, Loc, IsArrow, SS,
14548-
/*TemplateKwLoc=*/SourceLocation(), MemberLookup,
14549-
/*TemplateArgs=*/nullptr, /*S=*/nullptr).get());
14544+
Builder.build(S, Loc), Type, Loc, IsArrow, SS,
14545+
/*TemplateKwLoc=*/SourceLocation(), MemberLookup,
14546+
/*TemplateArgs=*/nullptr, /*S=*/nullptr)
14547+
.get());
1455014548
}
1455114549

1455214550
MemberBuilder(const ExprBuilder &Builder, QualType Type, bool IsArrow,
@@ -14752,12 +14750,11 @@ buildSingleCopyAssignRecursively(Sema &S, SourceLocation Loc, QualType T,
1475214750
Loc);
1475314751

1475414752
// Create the reference to operator=.
14755-
ExprResult OpEqualRef
14756-
= S.BuildMemberReferenceExpr(To.build(S, Loc), T, Loc, /*IsArrow=*/false,
14757-
SS, /*TemplateKWLoc=*/SourceLocation(),
14758-
OpLookup,
14759-
/*TemplateArgs=*/nullptr, /*S*/nullptr,
14760-
/*SuppressQualifierCheck=*/true);
14753+
ExprResult OpEqualRef = S.BuildMemberReferenceExpr(
14754+
To.build(S, Loc), T, Loc, /*IsArrow=*/false, SS,
14755+
/*TemplateKWLoc=*/SourceLocation(), OpLookup,
14756+
/*TemplateArgs=*/nullptr, /*S*/ nullptr,
14757+
/*SuppressQualifierCheck=*/true);
1476114758
if (OpEqualRef.isInvalid())
1476214759
return StmtError();
1476314760

0 commit comments

Comments
 (0)