github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code.
:warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff origin/main HEAD --extensions h,cpp --
clang/lib/Sema/SemaExpand.cpp clang/test/AST/ast-dump-expansion-stmt.cpp
clang/test/AST/ast-print-expansion-stmts.cpp
clang/test/CodeGenCXX/cxx2c-destructuring-expansion-stmt.cpp
clang/test/CodeGenCXX/cxx2c-enumerating-expansion-statements.cpp
clang/test/CodeGenCXX/cxx2c-expansion-stmts-control-flow.cpp
clang/test/CodeGenCXX/cxx2c-expansion-stmts-templates.cpp
clang/test/CodeGenCXX/cxx2c-iterating-expansion-stmt.cpp
clang/test/Parser/cxx2c-expansion-statements.cpp
clang/test/SemaCXX/cxx2c-expansion-statements.cpp
clang/test/SemaCXX/cxx2c-fexpansion-statements.cpp
clang/include/clang/AST/ASTNodeTraverser.h
clang/include/clang/AST/ComputeDependence.h clang/include/clang/AST/Decl.h
clang/include/clang/AST/DeclBase.h clang/include/clang/AST/DeclTemplate.h
clang/include/clang/AST/ExprCXX.h clang/include/clang/AST/RecursiveASTVisitor.h
clang/include/clang/AST/StmtCXX.h clang/include/clang/AST/TextNodeDumper.h
clang/include/clang/Parse/Parser.h clang/include/clang/Sema/ScopeInfo.h
clang/include/clang/Sema/Sema.h clang/include/clang/Serialization/ASTBitCodes.h
clang/lib/AST/ASTImporter.cpp clang/lib/AST/ComputeDependence.cpp
clang/lib/AST/DeclBase.cpp clang/lib/AST/DeclPrinter.cpp
clang/lib/AST/DeclTemplate.cpp clang/lib/AST/Expr.cpp clang/lib/AST/ExprCXX.cpp
clang/lib/AST/ExprClassification.cpp clang/lib/AST/ExprConstant.cpp
clang/lib/AST/ItaniumMangle.cpp clang/lib/AST/StmtCXX.cpp
clang/lib/AST/StmtPrinter.cpp clang/lib/AST/StmtProfile.cpp
clang/lib/AST/TextNodeDumper.cpp clang/lib/CodeGen/CGDecl.cpp
clang/lib/CodeGen/CGStmt.cpp clang/lib/CodeGen/CodeGenFunction.h
clang/lib/Driver/ToolChains/Clang.cpp clang/lib/Frontend/FrontendActions.cpp
clang/lib/Parse/ParseDecl.cpp clang/lib/Parse/ParseExpr.cpp
clang/lib/Parse/ParseInit.cpp clang/lib/Parse/ParseStmt.cpp
clang/lib/Sema/Sema.cpp clang/lib/Sema/SemaDecl.cpp
clang/lib/Sema/SemaDeclCXX.cpp clang/lib/Sema/SemaExceptionSpec.cpp
clang/lib/Sema/SemaExpr.cpp clang/lib/Sema/SemaExprCXX.cpp
clang/lib/Sema/SemaLambda.cpp clang/lib/Sema/SemaLookup.cpp
clang/lib/Sema/SemaStmt.cpp clang/lib/Sema/SemaTemplateInstantiate.cpp
clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
clang/lib/Sema/SemaTemplateVariadic.cpp clang/lib/Sema/TreeTransform.h
clang/lib/Serialization/ASTCommon.cpp clang/lib/Serialization/ASTReaderDecl.cpp
clang/lib/Serialization/ASTReaderStmt.cpp
clang/lib/Serialization/ASTWriterDecl.cpp
clang/lib/Serialization/ASTWriterStmt.cpp
clang/lib/StaticAnalyzer/Core/ExprEngine.cpp clang/tools/libclang/CIndex.cpp
clang/tools/libclang/CXCursor.cpp --diff_from_common_commit
``````````
:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/clang/include/clang/AST/ASTNodeTraverser.h
b/clang/include/clang/AST/ASTNodeTraverser.h
index 699158003..de0aa7f62 100644
--- a/clang/include/clang/AST/ASTNodeTraverser.h
+++ b/clang/include/clang/AST/ASTNodeTraverser.h
@@ -959,7 +959,7 @@ public:
}
}
- void VisitExpansionStmtDecl(const ExpansionStmtDecl* Node) {
+ void VisitExpansionStmtDecl(const ExpansionStmtDecl *Node) {
Visit(Node->getExpansionPattern());
if (Traversal != TK_IgnoreUnlessSpelledInSource)
Visit(Node->getInstantiations());
diff --git a/clang/include/clang/AST/DeclBase.h
b/clang/include/clang/AST/DeclBase.h
index 00866efa4..b26d10c69 100644
--- a/clang/include/clang/AST/DeclBase.h
+++ b/clang/include/clang/AST/DeclBase.h
@@ -2195,9 +2195,7 @@ public:
return getDeclKind() == Decl::RequiresExprBody;
}
- bool isExpansionStmt() const {
- return getDeclKind() == Decl::ExpansionStmt;
- }
+ bool isExpansionStmt() const { return getDeclKind() == Decl::ExpansionStmt; }
bool isNamespace() const { return getDeclKind() == Decl::Namespace; }
diff --git a/clang/include/clang/AST/DeclTemplate.h
b/clang/include/clang/AST/DeclTemplate.h
index 4dc7fefb6..7edc8e80d 100644
--- a/clang/include/clang/AST/DeclTemplate.h
+++ b/clang/include/clang/AST/DeclTemplate.h
@@ -3355,7 +3355,7 @@ public:
class ExpansionStmtDecl : public Decl, public DeclContext {
CXXExpansionStmt *Expansion = nullptr;
TemplateParameterList *TParams;
- CXXExpansionInstantiationStmt* Instantiations = nullptr;
+ CXXExpansionInstantiationStmt *Instantiations = nullptr;
ExpansionStmtDecl(DeclContext *DC, SourceLocation Loc,
TemplateParameterList *TParams);
@@ -3377,7 +3377,9 @@ public:
return Instantiations;
}
- void setInstantiations(CXXExpansionInstantiationStmt *S) { Instantiations =
S; }
+ void setInstantiations(CXXExpansionInstantiationStmt *S) {
+ Instantiations = S;
+ }
NonTypeTemplateParmDecl *getIndexTemplateParm() const {
return cast<NonTypeTemplateParmDecl>(TParams->getParam(0));
diff --git a/clang/include/clang/AST/ExprCXX.h
b/clang/include/clang/AST/ExprCXX.h
index 5f50064d5..580523ed8 100644
--- a/clang/include/clang/AST/ExprCXX.h
+++ b/clang/include/clang/AST/ExprCXX.h
@@ -5546,7 +5546,7 @@ public:
}
const_child_range children() const {
- Stmt** Stmts = getTrailingStmts();
+ Stmt **Stmts = getTrailingStmts();
return const_child_range(Stmts, Stmts + NumExprs);
}
@@ -5555,8 +5555,8 @@ public:
}
private:
- Stmt** getTrailingStmts() const {
- return reinterpret_cast<Stmt**>(const_cast<Expr**>(getTrailingObjects()));
+ Stmt **getTrailingStmts() const {
+ return reinterpret_cast<Stmt **>(const_cast<Expr
**>(getTrailingObjects()));
}
};
@@ -5581,13 +5581,11 @@ public:
return cast<CXXExpansionInitListExpr>(SubExprs[RANGE]);
}
- void setRangeExpr(CXXExpansionInitListExpr* E) {
- SubExprs[RANGE] = E;
- }
+ void setRangeExpr(CXXExpansionInitListExpr *E) { SubExprs[RANGE] = E; }
Expr *getIndexExpr() { return SubExprs[INDEX]; }
const Expr *getIndexExpr() const { return SubExprs[INDEX]; }
- void setIndexExpr(Expr* E) { SubExprs[INDEX] = E; }
+ void setIndexExpr(Expr *E) { SubExprs[INDEX] = E; }
SourceLocation getBeginLoc() const { return getRangeExpr()->getBeginLoc(); }
SourceLocation getEndLoc() const { return getRangeExpr()->getEndLoc(); }
@@ -5599,8 +5597,8 @@ public:
const_child_range children() const {
return const_child_range(
- reinterpret_cast<Stmt **>(const_cast<Expr **>(SubExprs)),
- reinterpret_cast<Stmt **>(const_cast<Expr **>(SubExprs + COUNT)));
+ reinterpret_cast<Stmt **>(const_cast<Expr **>(SubExprs)),
+ reinterpret_cast<Stmt **>(const_cast<Expr **>(SubExprs + COUNT)));
}
static bool classof(const Stmt *T) {
diff --git a/clang/include/clang/AST/RecursiveASTVisitor.h
b/clang/include/clang/AST/RecursiveASTVisitor.h
index 33413f8a7..7941b15a7 100644
--- a/clang/include/clang/AST/RecursiveASTVisitor.h
+++ b/clang/include/clang/AST/RecursiveASTVisitor.h
@@ -1882,8 +1882,9 @@ DEF_TRAVERSE_DECL(UsingShadowDecl, {})
DEF_TRAVERSE_DECL(ConstructorUsingShadowDecl, {})
DEF_TRAVERSE_DECL(ExpansionStmtDecl, {
- if (D->getInstantiations() &&
getDerived().shouldVisitTemplateInstantiations())
- TRY_TO(TraverseStmt(D->getInstantiations()));
+ if (D->getInstantiations() &&
+ getDerived().shouldVisitTemplateInstantiations())
+ TRY_TO(TraverseStmt(D->getInstantiations()));
TRY_TO(TraverseStmt(D->getExpansionPattern()));
})
diff --git a/clang/include/clang/AST/StmtCXX.h
b/clang/include/clang/AST/StmtCXX.h
index 570151371..087f7f10c 100644
--- a/clang/include/clang/AST/StmtCXX.h
+++ b/clang/include/clang/AST/StmtCXX.h
@@ -583,12 +583,12 @@ public:
bool hasDependentSize() const;
- ExpansionStmtDecl* getDecl() { return ParentDecl; }
- const ExpansionStmtDecl* getDecl() const { return ParentDecl; }
+ ExpansionStmtDecl *getDecl() { return ParentDecl; }
+ const ExpansionStmtDecl *getDecl() const { return ParentDecl; }
Stmt *getInit() { return SubStmts[INIT]; }
const Stmt *getInit() const { return SubStmts[INIT]; }
- void setInit(Stmt* S) { SubStmts[INIT] = S; }
+ void setInit(Stmt *S) { SubStmts[INIT] = S; }
VarDecl *getExpansionVariable();
const VarDecl *getExpansionVariable() const {
@@ -600,11 +600,11 @@ public:
return cast<DeclStmt>(SubStmts[VAR]);
}
- void setExpansionVarStmt(Stmt* S) { SubStmts[VAR] = S; }
+ void setExpansionVarStmt(Stmt *S) { SubStmts[VAR] = S; }
Stmt *getBody() { return SubStmts[BODY]; }
const Stmt *getBody() const { return SubStmts[BODY]; }
- void setBody(Stmt* S) { SubStmts[BODY] = S; }
+ void setBody(Stmt *S) { SubStmts[BODY] = S; }
static bool classof(const Stmt *T) {
return T->getStmtClass() >= firstCXXExpansionStmtConstant &&
@@ -829,23 +829,21 @@ public:
unsigned NumInstantiations,
unsigned NumSharedStmts);
- ArrayRef<Stmt*> getAllSubStmts() const {
+ ArrayRef<Stmt *> getAllSubStmts() const {
return getTrailingObjects(getNumSubStmts());
}
- MutableArrayRef<Stmt*> getAllSubStmts() {
+ MutableArrayRef<Stmt *> getAllSubStmts() {
return getTrailingObjects(getNumSubStmts());
}
- unsigned getNumSubStmts() const {
- return NumInstantiations + NumSharedStmts;
- }
+ unsigned getNumSubStmts() const { return NumInstantiations + NumSharedStmts;
}
- ArrayRef<Stmt*> getInstantiations() const {
+ ArrayRef<Stmt *> getInstantiations() const {
return getTrailingObjects(NumInstantiations);
}
- ArrayRef<Stmt*> getSharedStmts() const {
+ ArrayRef<Stmt *> getSharedStmts() const {
return getAllSubStmts().drop_front(NumInstantiations);
}
diff --git a/clang/include/clang/Parse/Parser.h
b/clang/include/clang/Parse/Parser.h
index add8e6ae5..f5abbfc6f 100644
--- a/clang/include/clang/Parse/Parser.h
+++ b/clang/include/clang/Parse/Parser.h
@@ -7469,9 +7469,9 @@ public:
/// [C++0x] expression
/// [C++0x] braced-init-list [TODO]
/// \endverbatim
- StmtResult ParseForStatement(SourceLocation *TrailingElseLoc,
- LabelDecl *PrecedingLabel,
- ExpansionStmtDecl *ExpansionStmtDeclaration =
nullptr);
+ StmtResult
+ ParseForStatement(SourceLocation *TrailingElseLoc, LabelDecl *PrecedingLabel,
+ ExpansionStmtDecl *ExpansionStmtDeclaration = nullptr);
void ParseForRangeInitializerAfterColon(ForRangeInit &FRI,
ParsingDeclSpec *VarDeclSpec);
diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h
index 209261b67..d1e50bfcb 100644
--- a/clang/include/clang/Sema/Sema.h
+++ b/clang/include/clang/Sema/Sema.h
@@ -15685,10 +15685,12 @@ public:
ExprResult BuildCXXExpansionInitializer(ExpansionStmtDecl *ESD,
Expr *ExpansionInitializer);
- StmtResult BuildCXXEnumeratingExpansionStmt(
- Decl *ESD, Stmt *Init, Stmt *ExpansionVar, SourceLocation ForLoc,
- SourceLocation LParenLoc, SourceLocation ColonLoc,
- SourceLocation RParenLoc);
+ StmtResult BuildCXXEnumeratingExpansionStmt(Decl *ESD, Stmt *Init,
+ Stmt *ExpansionVar,
+ SourceLocation ForLoc,
+ SourceLocation LParenLoc,
+ SourceLocation ColonLoc,
+ SourceLocation RParenLoc);
ExprResult
BuildCXXExpansionInitListSelectExpr(CXXExpansionInitListExpr *Range,
diff --git a/clang/lib/AST/ComputeDependence.cpp
b/clang/lib/AST/ComputeDependence.cpp
index c220e10a6..b5f2a22bd 100644
--- a/clang/lib/AST/ComputeDependence.cpp
+++ b/clang/lib/AST/ComputeDependence.cpp
@@ -960,8 +960,9 @@ ExprDependence
clang::computeDependence(OpenACCAsteriskSizeExpr *E) {
return ExprDependence::None;
}
-ExprDependence clang::computeDependence(CXXExpansionInitListExpr* ILE) {
+ExprDependence clang::computeDependence(CXXExpansionInitListExpr *ILE) {
auto D = ExprDependence::None;
- for (Expr* E : ILE->getExprs()) D |= E->getDependence();
+ for (Expr *E : ILE->getExprs())
+ D |= E->getDependence();
return D;
}
diff --git a/clang/lib/AST/DeclPrinter.cpp b/clang/lib/AST/DeclPrinter.cpp
index 45da7ef5a..6bc06918d 100644
--- a/clang/lib/AST/DeclPrinter.cpp
+++ b/clang/lib/AST/DeclPrinter.cpp
@@ -113,7 +113,7 @@ namespace {
void VisitNonTypeTemplateParmDecl(const NonTypeTemplateParmDecl *NTTP);
void VisitTemplateTemplateParmDecl(const TemplateTemplateParmDecl *);
void VisitHLSLBufferDecl(HLSLBufferDecl *D);
- void VisitExpansionStmtDecl(const ExpansionStmtDecl* D);
+ void VisitExpansionStmtDecl(const ExpansionStmtDecl *D);
void VisitOpenACCDeclareDecl(OpenACCDeclareDecl *D);
void VisitOpenACCRoutineDecl(OpenACCRoutineDecl *D);
@@ -1330,7 +1330,7 @@ void
DeclPrinter::VisitClassTemplatePartialSpecializationDecl(
VisitCXXRecordDecl(D);
}
-void DeclPrinter::VisitExpansionStmtDecl(const ExpansionStmtDecl* D) {
+void DeclPrinter::VisitExpansionStmtDecl(const ExpansionStmtDecl *D) {
D->getExpansionPattern()->printPretty(Out, nullptr, Policy, Indentation,
"\n",
&Context);
}
diff --git a/clang/lib/AST/DeclTemplate.cpp b/clang/lib/AST/DeclTemplate.cpp
index eea5eec0d..1cd88efb5 100644
--- a/clang/lib/AST/DeclTemplate.cpp
+++ b/clang/lib/AST/DeclTemplate.cpp
@@ -1795,15 +1795,16 @@ const Decl &clang::adjustDeclToTemplate(const Decl &D) {
ExpansionStmtDecl::ExpansionStmtDecl(DeclContext *DC, SourceLocation Loc,
TemplateParameterList *TParams)
- : Decl(ExpansionStmt, DC, Loc), DeclContext(ExpansionStmt),
TParams(TParams) {}
-
+ : Decl(ExpansionStmt, DC, Loc), DeclContext(ExpansionStmt),
+ TParams(TParams) {}
ExpansionStmtDecl *ExpansionStmtDecl::Create(ASTContext &C, DeclContext *DC,
- SourceLocation Loc,
- TemplateParameterList *TParams) {
+ SourceLocation Loc,
+ TemplateParameterList *TParams) {
return new (C, DC) ExpansionStmtDecl(DC, Loc, TParams);
}
-ExpansionStmtDecl *ExpansionStmtDecl::CreateDeserialized(ASTContext &C,
GlobalDeclID ID) {
+ExpansionStmtDecl *ExpansionStmtDecl::CreateDeserialized(ASTContext &C,
+ GlobalDeclID ID) {
return new (C, ID) ExpansionStmtDecl(nullptr, SourceLocation(), nullptr);
}
diff --git a/clang/lib/AST/ExprCXX.cpp b/clang/lib/AST/ExprCXX.cpp
index eb73ab40a..7ba49f74c 100644
--- a/clang/lib/AST/ExprCXX.cpp
+++ b/clang/lib/AST/ExprCXX.cpp
@@ -2039,7 +2039,7 @@ CXXExpansionInitListExpr *
CXXExpansionInitListExpr::Create(const ASTContext &C, ArrayRef<Expr *> Exprs,
SourceLocation LBraceLoc,
SourceLocation RBraceLoc) {
- void* Mem = C.Allocate(totalSizeToAlloc<Expr *>(Exprs.size()));
+ void *Mem = C.Allocate(totalSizeToAlloc<Expr *>(Exprs.size()));
return new (Mem) CXXExpansionInitListExpr(Exprs, LBraceLoc, RBraceLoc);
}
@@ -2051,8 +2051,7 @@ CXXExpansionInitListExpr::CreateEmpty(const ASTContext
&C, EmptyShell Empty,
}
CXXExpansionInitListSelectExpr::CXXExpansionInitListSelectExpr(EmptyShell
Empty)
- : Expr(CXXExpansionInitListSelectExprClass, Empty) {
-}
+ : Expr(CXXExpansionInitListSelectExprClass, Empty) {}
CXXExpansionInitListSelectExpr::CXXExpansionInitListSelectExpr(
const ASTContext &C, CXXExpansionInitListExpr *Range, Expr *Idx)
diff --git a/clang/lib/AST/StmtPrinter.cpp b/clang/lib/AST/StmtPrinter.cpp
index 4f38f4a6b..ce4455fd1 100644
--- a/clang/lib/AST/StmtPrinter.cpp
+++ b/clang/lib/AST/StmtPrinter.cpp
@@ -493,7 +493,7 @@ void StmtPrinter::VisitCXXExpansionInstantiationStmt(
void StmtPrinter::VisitCXXExpansionInitListExpr(
CXXExpansionInitListExpr *Node) {
OS << "{ ";
- llvm::interleaveComma(Node->getExprs(), OS, [&](Expr* E) { PrintExpr(E); });
+ llvm::interleaveComma(Node->getExprs(), OS, [&](Expr *E) { PrintExpr(E); });
OS << " }";
}
diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp
index 2e4bfac36..a8f100064 100644
--- a/clang/lib/CodeGen/CGDecl.cpp
+++ b/clang/lib/CodeGen/CGDecl.cpp
@@ -144,7 +144,7 @@ void CodeGenFunction::EmitDecl(const Decl &D, bool
EvaluateConditionDecl) {
return;
case Decl::ExpansionStmt: {
- const auto* ESD = cast<ExpansionStmtDecl>(&D);
+ const auto *ESD = cast<ExpansionStmtDecl>(&D);
assert(ESD->getInstantiations() && "expansion statement not expanded?");
EmitStmt(ESD->getInstantiations());
return;
diff --git a/clang/lib/CodeGen/CGStmt.cpp b/clang/lib/CodeGen/CGStmt.cpp
index 320893922..2892ef8a6 100644
--- a/clang/lib/CodeGen/CGStmt.cpp
+++ b/clang/lib/CodeGen/CGStmt.cpp
@@ -1578,7 +1578,7 @@ void CodeGenFunction::EmitCXXExpansionInstantiationStmt(
LexicalScope Scope(*this, S.getSourceRange());
LexicalScope Scope2(*this, S.getSourceRange());
- for (const Stmt* DS : S.getSharedStmts())
+ for (const Stmt *DS : S.getSharedStmts())
EmitStmt(DS);
if (S.getInstantiations().empty() || !HaveInsertPoint())
@@ -1594,14 +1594,14 @@ void CodeGenFunction::EmitCXXExpansionInstantiationStmt(
if (N == S.getInstantiations().size() - 1)
ContinueDest = ExpandExit;
- else
+ else
ContinueDest = getJumpDestInCurrentScope("expand.next");
- LexicalScope ExpansionScope(*this, S.getSourceRange());
- BreakContinueStack.push_back(BreakContinue(S, ExpandExit, ContinueDest));
- EmitStmt(Inst);
- BreakContinueStack.pop_back();
- EmitBlock(ContinueDest.getBlock(), true);
+ LexicalScope ExpansionScope(*this, S.getSourceRange());
+ BreakContinueStack.push_back(BreakContinue(S, ExpandExit, ContinueDest));
+ EmitStmt(Inst);
+ BreakContinueStack.pop_back();
+ EmitBlock(ContinueDest.getBlock(), true);
}
}
diff --git a/clang/lib/CodeGen/CodeGenFunction.h
b/clang/lib/CodeGen/CodeGenFunction.h
index 1ca43ce77..1616b6e60 100644
--- a/clang/lib/CodeGen/CodeGenFunction.h
+++ b/clang/lib/CodeGen/CodeGenFunction.h
@@ -3690,7 +3690,8 @@ public:
void EmitCXXForRangeStmt(const CXXForRangeStmt &S,
ArrayRef<const Attr *> Attrs = {});
- void EmitCXXExpansionInstantiationStmt(const CXXExpansionInstantiationStmt&
S);
+ void
+ EmitCXXExpansionInstantiationStmt(const CXXExpansionInstantiationStmt &S);
/// Controls insertion of cancellation exit blocks in worksharing constructs.
class OMPCancelStackRAII {
diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp
index a64c1f59c..fcc375da7 100644
--- a/clang/lib/Parse/ParseStmt.cpp
+++ b/clang/lib/Parse/ParseStmt.cpp
@@ -1900,7 +1900,8 @@ bool Parser::isForRangeIdentifier() {
return false;
}
-void Parser::ParseForRangeInitializerAfterColon(ForRangeInit& FRI,
ParsingDeclSpec *VarDeclSpec) {
+void Parser::ParseForRangeInitializerAfterColon(ForRangeInit &FRI,
+ ParsingDeclSpec *VarDeclSpec) {
// Use an immediate function context if this is the initializer for a
// constexpr variable in an expansion statement.
auto Ctx = Sema::ExpressionEvaluationContext::PotentiallyEvaluated;
@@ -1944,9 +1945,10 @@ void
Parser::ParseForRangeInitializerAfterColon(ForRangeInit& FRI, ParsingDeclSp
std::move(Actions.ExprEvalContexts.back().ForRangeLifetimeExtendTemps);
}
-StmtResult Parser::ParseForStatement(SourceLocation *TrailingElseLoc,
- LabelDecl *PrecedingLabel,
- ExpansionStmtDecl
*ExpansionStmtDeclaration) {
+StmtResult
+Parser::ParseForStatement(SourceLocation *TrailingElseLoc,
+ LabelDecl *PrecedingLabel,
+ ExpansionStmtDecl *ExpansionStmtDeclaration) {
assert(Tok.is(tok::kw_for) && "Not a for stmt!");
SourceLocation ForLoc = ConsumeToken(); // eat the 'for'.
@@ -2031,10 +2033,10 @@ StmtResult Parser::ParseForStatement(SourceLocation
*TrailingElseLoc,
ParseForRangeInitializerAfterColon(ForRangeInfo, /*VarDeclSpec=*/nullptr);
Diag(Loc, diag::err_for_range_identifier)
- << ForRangeInfo.ExpansionStmt
- << ((getLangOpts().CPlusPlus11 && !getLangOpts().CPlusPlus17)
- ? FixItHint::CreateInsertion(Loc, "auto &&")
- : FixItHint());
+ << ForRangeInfo.ExpansionStmt
+ << ((getLangOpts().CPlusPlus11 && !getLangOpts().CPlusPlus17)
+ ? FixItHint::CreateInsertion(Loc, "auto &&")
+ : FixItHint());
if (!ForRangeInfo.ExpansionStmt)
ForRangeInfo.LoopVar =
diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
index 9a75bfe52..420c59ccf 100644
--- a/clang/lib/Sema/Sema.cpp
+++ b/clang/lib/Sema/Sema.cpp
@@ -1638,7 +1638,8 @@ DeclContext *Sema::getFunctionLevelDeclContext(bool
AllowLambda) const {
cast<CXXMethodDecl>(DC)->getOverloadedOperator() == OO_Call &&
cast<CXXRecordDecl>(DC->getParent())->isLambda()) {
DC = DC->getParent()->getParent();
- } else break;
+ } else
+ break;
}
return DC;
diff --git a/clang/lib/Sema/SemaExpand.cpp b/clang/lib/Sema/SemaExpand.cpp
index 4951c9e52..210d2f4a9 100644
--- a/clang/lib/Sema/SemaExpand.cpp
+++ b/clang/lib/Sema/SemaExpand.cpp
@@ -398,7 +398,7 @@ StmtResult Sema::BuildNonEnumeratingCXXExpansionStmt(
ESD, Init, ExpansionVarStmt, DS, ForLoc, LParenLoc, ColonLoc, RParenLoc);
}
-StmtResult Sema::FinishCXXExpansionStmt(Stmt* Exp, Stmt *Body) {
+StmtResult Sema::FinishCXXExpansionStmt(Stmt *Exp, Stmt *Body) {
if (!Exp || !Body)
return StmtError();
@@ -419,7 +419,7 @@ StmtResult Sema::FinishCXXExpansionStmt(Stmt* Exp, Stmt
*Body) {
return StmtError();
// Collect shared statements.
- SmallVector<Stmt*, 1> Shared;
+ SmallVector<Stmt *, 1> Shared;
if (Expansion->getInit())
Shared.push_back(Expansion->getInit());
diff --git a/clang/lib/Sema/SemaLambda.cpp b/clang/lib/Sema/SemaLambda.cpp
index 16cb865e0..a37092c16 100644
--- a/clang/lib/Sema/SemaLambda.cpp
+++ b/clang/lib/Sema/SemaLambda.cpp
@@ -100,8 +100,9 @@ static inline UnsignedOrNone
getStackIndexOfNearestEnclosingCaptureReadyLambda(
// innermost nested lambda are dependent (otherwise we wouldn't have
// arrived here) - so we don't yet have a lambda that can capture the
// variable.
- if (IsCapturingVariable &&
-
VarToCapture->getDeclContext()->getEnclosingNonExpansionStatementContext()->Equals(EnclosingDC))
+ if (IsCapturingVariable && VarToCapture->getDeclContext()
+ ->getEnclosingNonExpansionStatementContext()
+ ->Equals(EnclosingDC))
return NoLambdaIsCaptureReady;
// For an enclosing lambda to be capture ready for an entity, all
@@ -126,7 +127,8 @@ static inline UnsignedOrNone
getStackIndexOfNearestEnclosingCaptureReadyLambda(
if (IsCapturingThis && !LSI->isCXXThisCaptured())
return NoLambdaIsCaptureReady;
}
- EnclosingDC =
getLambdaAwareParentOfDeclContext(EnclosingDC)->getEnclosingNonExpansionStatementContext();
+ EnclosingDC = getLambdaAwareParentOfDeclContext(EnclosingDC)
+ ->getEnclosingNonExpansionStatementContext();
assert(CurScopeIndex);
--CurScopeIndex;
@@ -2516,9 +2518,12 @@ Sema::LambdaScopeForCallOperatorInstantiationRAII::
while (FDPattern && FD) {
InstantiationAndPatterns.emplace_back(FDPattern, FD);
- FDPattern =
-
dyn_cast<FunctionDecl>(getLambdaAwareParentOfDeclContext(FDPattern)->getEnclosingNonExpansionStatementContext());
- FD =
dyn_cast<FunctionDecl>(getLambdaAwareParentOfDeclContext(FD)->getEnclosingNonExpansionStatementContext());
+ FDPattern = dyn_cast<FunctionDecl>(
+ getLambdaAwareParentOfDeclContext(FDPattern)
+ ->getEnclosingNonExpansionStatementContext());
+ FD = dyn_cast<FunctionDecl>(
+ getLambdaAwareParentOfDeclContext(FD)
+ ->getEnclosingNonExpansionStatementContext());
}
// Add instantiated parameters and local vars to scopes, starting from the
diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index 63c4c5e33..14ebf7260 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/lib/Sema/SemaStmt.cpp
@@ -2454,7 +2454,6 @@ VarDecl *BuildForRangeVarDecl(Sema &SemaRef,
SourceLocation Loc, QualType Type,
Decl->setConstexpr(true);
return Decl;
}
-
}
static bool ObjCEnumerationCollection(Expr *Collection) {
@@ -2727,20 +2726,19 @@ static StmtResult RebuildForRangeWithDereference(Sema
&SemaRef, Scope *S,
void Sema::ApplyForRangeOrExpansionStatementLifetimeExtension(
VarDecl *RangeVar, ArrayRef<MaterializeTemporaryExpr *> Temporaries) {
- if (Temporaries.empty())
- return;
+ if (Temporaries.empty())
+ return;
- InitializedEntity Entity = InitializedEntity::InitializeVariable(RangeVar);
- for (auto *MTE : Temporaries)
- MTE->setExtendingDecl(RangeVar, Entity.allocateManglingNumber());
+ InitializedEntity Entity = InitializedEntity::InitializeVariable(RangeVar);
+ for (auto *MTE : Temporaries)
+ MTE->setExtendingDecl(RangeVar, Entity.allocateManglingNumber());
}
Sema::ForRangeBeginEndInfo Sema::BuildCXXForRangeBeginEndVars(
Scope *S, VarDecl *RangeVar, SourceLocation ColonLoc,
SourceLocation CoawaitLoc,
ArrayRef<MaterializeTemporaryExpr *> LifetimeExtendTemps,
- BuildForRangeKind Kind, bool ForExpansionStmt,
- StmtResult *RebuildResult,
+ BuildForRangeKind Kind, bool ForExpansionStmt, StmtResult *RebuildResult,
llvm::function_ref<StmtResult()> RebuildWithDereference) {
QualType RangeVarType = RangeVar->getType();
SourceLocation RangeLoc = RangeVar->getLocation();
@@ -3038,7 +3036,7 @@ StmtResult Sema::BuildCXXForRangeStmt(
ActOnFinishFullExpr(NotEqExpr.get(), /*DiscardedValue*/ false);
if (NotEqExpr.isInvalid()) {
Diag(RangeLoc, diag::note_for_range_invalid_iterator)
- << RangeLoc << 0 << BeginRangeRefTy;
+ << RangeLoc << 0 << BeginRangeRefTy;
NoteForRangeBeginEndFunction(*this, BeginExpr, BEF_begin);
if (!Context.hasSameType(BeginType, EndType))
NoteForRangeBeginEndFunction(*this, EndExpr, BEF_end);
@@ -3061,7 +3059,7 @@ StmtResult Sema::BuildCXXForRangeStmt(
IncrExpr = ActOnFinishFullExpr(IncrExpr.get(), /*DiscardedValue*/ false);
if (IncrExpr.isInvalid()) {
Diag(RangeLoc, diag::note_for_range_invalid_iterator)
- << RangeLoc << 2 << BeginRangeRefTy ;
+ << RangeLoc << 2 << BeginRangeRefTy;
NoteForRangeBeginEndFunction(*this, BeginExpr, BEF_begin);
return StmtError();
}
@@ -3075,7 +3073,7 @@ StmtResult Sema::BuildCXXForRangeStmt(
ExprResult DerefExpr = ActOnUnaryOp(S, ColonLoc, tok::star,
BeginRef.get());
if (DerefExpr.isInvalid()) {
Diag(RangeLoc, diag::note_for_range_invalid_iterator)
- << RangeLoc << 1 << BeginRangeRefTy;
+ << RangeLoc << 1 << BeginRangeRefTy;
NoteForRangeBeginEndFunction(*this, BeginExpr, BEF_begin);
return StmtError();
}
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 25c9e97b9..2cebdcff0 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -2070,7 +2070,8 @@ Decl
*TemplateDeclInstantiator::VisitStaticAssertDecl(StaticAssertDecl *D) {
InstantiatedMessageExpr.get(), D->getRParenLoc(), D->isFailed());
}
-Decl *TemplateDeclInstantiator::VisitExpansionStmtDecl(ExpansionStmtDecl
*OldESD) {
+Decl *
+TemplateDeclInstantiator::VisitExpansionStmtDecl(ExpansionStmtDecl *OldESD) {
Decl *Index = VisitNonTypeTemplateParmDecl(OldESD->getIndexTemplateParm());
ExpansionStmtDecl *NewESD = SemaRef.BuildExpansionStmtDecl(
Owner, OldESD->getBeginLoc(), cast<NonTypeTemplateParmDecl>(Index));
diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h
index 3d41ddd94..6c94ef0af 100644
--- a/clang/lib/Sema/TreeTransform.h
+++ b/clang/lib/Sema/TreeTransform.h
@@ -9419,9 +9419,8 @@ ExprResult
TreeTransform<Derived>::TransformCXXExpansionInitListExpr(
CXXExpansionInitListExpr *E) {
bool ArgChanged = false;
SmallVector<Expr *> SubExprs;
- if (getDerived().TransformExprs(E->getExprs().data(),
- E->getExprs().size(), false, SubExprs,
- &ArgChanged))
+ if (getDerived().TransformExprs(E->getExprs().data(), E->getExprs().size(),
+ false, SubExprs, &ArgChanged))
return ExprError();
if (!getDerived().AlwaysRebuild() && !ArgChanged)
@@ -9449,8 +9448,8 @@ StmtResult
TreeTransform<Derived>::TransformCXXExpansionInstantiationStmt(
return false;
};
- SmallVector<Stmt*> SharedStmts;
- SmallVector<Stmt*> Instantiations;
+ SmallVector<Stmt *> SharedStmts;
+ SmallVector<Stmt *> Instantiations;
// Apply lifetime extension to the shared statements in case this is a
// destructuring expansion statement (for other kinds of expansion
@@ -9495,7 +9494,7 @@ ExprResult
TreeTransform<Derived>::TransformCXXExpansionInitListSelectExpr(
return E;
return SemaRef.BuildCXXExpansionInitListSelectExpr(
- Range.getAs<CXXExpansionInitListExpr>(), Idx.get());
+ Range.getAs<CXXExpansionInitListExpr>(), Idx.get());
}
template <typename Derived>
diff --git a/clang/lib/Serialization/ASTWriterStmt.cpp
b/clang/lib/Serialization/ASTWriterStmt.cpp
index a2d4daaee..d3f577166 100644
--- a/clang/lib/Serialization/ASTWriterStmt.cpp
+++ b/clang/lib/Serialization/ASTWriterStmt.cpp
@@ -1763,7 +1763,7 @@ void
ASTStmtWriter::VisitCXXExpansionInitListExpr(CXXExpansionInitListExpr *E) {
Record.push_back(E->getNumExprs());
Record.AddSourceLocation(E->getLBraceLoc());
Record.AddSourceLocation(E->getRBraceLoc());
- for (Expr* SubExpr : E->getExprs())
+ for (Expr *SubExpr : E->getExprs())
Record.AddStmt(SubExpr);
Code = serialization::EXPR_CXX_EXPANSION_INIT_LIST;
}
``````````
</details>
https://github.com/llvm/llvm-project/pull/165195
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
