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 fada9227325b3eaa0bdc09a486f29a7f08b7b3fb fc4e93006a8a1def0fabdc358ce85fac267e5a63 --extensions c,h,cpp -- clang/test/OpenMP/assume_lambda.cpp clang/test/OpenMP/assume_messages.c clang/test/OpenMP/assume_messages_attr.c clang/test/OpenMP/assume_serialize_deserialize.cpp clang/test/OpenMP/assume_serialize_deserialize_tmpl.cpp clang/test/OpenMP/assume_template.cpp clang/include/clang-c/Index.h clang/include/clang/AST/OpenMPClause.h clang/include/clang/AST/RecursiveASTVisitor.h clang/include/clang/AST/StmtOpenMP.h clang/include/clang/Basic/OpenMPKinds.h clang/include/clang/Parse/Parser.h clang/include/clang/Sema/SemaOpenMP.h clang/include/clang/Serialization/ASTBitCodes.h clang/lib/AST/OpenMPClause.cpp clang/lib/AST/StmtOpenMP.cpp clang/lib/AST/StmtPrinter.cpp clang/lib/AST/StmtProfile.cpp clang/lib/Basic/OpenMPKinds.cpp clang/lib/CodeGen/CGStmt.cpp clang/lib/CodeGen/CGStmtOpenMP.cpp clang/lib/CodeGen/CodeGenFunction.h clang/lib/Parse/ParseOpenMP.cpp clang/lib/Sema/SemaOpenMP.cpp clang/lib/Sema/TreeTransform.h clang/lib/Serialization/ASTReader.cpp clang/lib/Serialization/ASTReaderStmt.cpp clang/lib/Serialization/ASTWriter.cpp clang/lib/Serialization/ASTWriterStmt.cpp clang/tools/libclang/CIndex.cpp `````````` </details> <details> <summary> View the diff from clang-format here. </summary> ``````````diff diff --git a/clang/include/clang/AST/OpenMPClause.h b/clang/include/clang/AST/OpenMPClause.h index fb11578679..13e3405890 100644 --- a/clang/include/clang/AST/OpenMPClause.h +++ b/clang/include/clang/AST/OpenMPClause.h @@ -29,10 +29,10 @@ #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/MapVector.h" #include "llvm/ADT/PointerIntPair.h" +#include "llvm/ADT/SmallSet.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/iterator.h" #include "llvm/ADT/iterator_range.h" -#include "llvm/ADT/SmallSet.h" #include "llvm/Frontend/OpenMP/OMPAssume.h" #include "llvm/Frontend/OpenMP/OMPConstants.h" #include "llvm/Frontend/OpenMP/OMPContext.h" @@ -2021,8 +2021,7 @@ public: /// #pragma omp assume absent(<directive-name list>) /// \endcode /// In this example directive '#pragma omp assume' has an 'absent' clause. -class OMPAbsentClause final - : public OMPNoChildClause<llvm::omp::OMPC_absent> { +class OMPAbsentClause final : public OMPNoChildClause<llvm::omp::OMPC_absent> { llvm::SmallSet<OpenMPDirectiveKind, 4> DirectiveKinds; /// Location of '('. @@ -2034,20 +2033,19 @@ public: /// \param StartLoc Starting location of the clause. /// \param EndLoc Ending location of the clause. OMPAbsentClause(llvm::SmallSet<OpenMPDirectiveKind, 4> &DKSet, - SourceLocation StartLoc, - SourceLocation LParenLoc, + SourceLocation StartLoc, SourceLocation LParenLoc, SourceLocation EndLoc) : OMPNoChildClause(StartLoc, EndLoc), DirectiveKinds(DKSet), LParenLoc(LParenLoc) {} /// Build an empty clause. - OMPAbsentClause() : OMPNoChildClause() { } + OMPAbsentClause() : OMPNoChildClause() {} SourceLocation getLParenLoc() { return LParenLoc; } void setLParenLoc(SourceLocation S) { LParenLoc = S; } - llvm::SmallSet<OpenMPDirectiveKind, 4>& getDirectiveKinds() { + llvm::SmallSet<OpenMPDirectiveKind, 4> &getDirectiveKinds() { return DirectiveKinds; } @@ -2056,7 +2054,6 @@ public: } }; - /// This represents the 'contains' clause in the '#pragma omp assume' /// directive. /// @@ -2077,20 +2074,19 @@ public: /// \param StartLoc Starting location of the clause. /// \param EndLoc Ending location of the clause. OMPContainsClause(llvm::SmallSet<OpenMPDirectiveKind, 4> &DKSet, - SourceLocation StartLoc, - SourceLocation LParenLoc, + SourceLocation StartLoc, SourceLocation LParenLoc, SourceLocation EndLoc) : OMPNoChildClause(StartLoc, EndLoc), DirectiveKinds(DKSet), - LParenLoc(LParenLoc) { } + LParenLoc(LParenLoc) {} /// Build an empty clause. - OMPContainsClause() : OMPNoChildClause() { } + OMPContainsClause() : OMPNoChildClause() {} SourceLocation getLParenLoc() { return LParenLoc; } void setLParenLoc(SourceLocation S) { LParenLoc = S; } - llvm::SmallSet<OpenMPDirectiveKind, 4>& getDirectiveKinds() { + llvm::SmallSet<OpenMPDirectiveKind, 4> &getDirectiveKinds() { return DirectiveKinds; } @@ -2120,7 +2116,7 @@ public: : OMPOneStmtClause(E, StartLoc, LParenLoc, EndLoc) {} /// Build an empty clause. - OMPHoldsClause() : OMPOneStmtClause() { } + OMPHoldsClause() : OMPOneStmtClause() {} Expr *getExpr() const { return getStmtAs<Expr>(); } void setExpr(Expr *E) { setStmt(E); } @@ -2141,10 +2137,10 @@ public: /// \param StartLoc Starting location of the clause. /// \param EndLoc Ending location of the clause. OMPNoOpenMPClause(SourceLocation StartLoc, SourceLocation EndLoc) - : OMPNoChildClause(StartLoc, EndLoc) { } + : OMPNoChildClause(StartLoc, EndLoc) {} /// Build an empty clause. - OMPNoOpenMPClause() : OMPNoChildClause() { } + OMPNoOpenMPClause() : OMPNoChildClause() {} }; /// This represents the 'no_openmp_routines' clause in the '#pragma omp assume' @@ -2156,17 +2152,17 @@ public: /// In this example directive '#pragma omp assume' has a 'no_openmp_routines' /// clause. class OMPNoOpenMPRoutinesClause final - : public OMPNoChildClause<llvm::omp::OMPC_no_openmp_routines> { + : public OMPNoChildClause<llvm::omp::OMPC_no_openmp_routines> { public: /// Build 'no_openmp_routines' clause. /// /// \param StartLoc Starting location of the clause. /// \param EndLoc Ending location of the clause. OMPNoOpenMPRoutinesClause(SourceLocation StartLoc, SourceLocation EndLoc) - : OMPNoChildClause(StartLoc, EndLoc) { } + : OMPNoChildClause(StartLoc, EndLoc) {} /// Build an empty clause. - OMPNoOpenMPRoutinesClause() : OMPNoChildClause() { } + OMPNoOpenMPRoutinesClause() : OMPNoChildClause() {} }; /// This represents the 'no_parallelism' clause in the '#pragma omp assume' @@ -2185,10 +2181,10 @@ public: /// \param StartLoc Starting location of the clause. /// \param EndLoc Ending location of the clause. OMPNoParallelismClause(SourceLocation StartLoc, SourceLocation EndLoc) - : OMPNoChildClause(StartLoc, EndLoc) { } + : OMPNoChildClause(StartLoc, EndLoc) {} /// Build an empty clause. - OMPNoParallelismClause() : OMPNoChildClause() { } + OMPNoParallelismClause() : OMPNoChildClause() {} }; /// This represents 'read' clause in the '#pragma omp atomic' directive. diff --git a/clang/include/clang/AST/StmtOpenMP.h b/clang/include/clang/AST/StmtOpenMP.h index f55d1b7d8a..7e5d4934aa 100644 --- a/clang/include/clang/AST/StmtOpenMP.h +++ b/clang/include/clang/AST/StmtOpenMP.h @@ -6496,18 +6496,17 @@ class OMPAssumeDirective : public OMPExecutableDirective { private: OMPAssumeDirective(SourceLocation StartLoc, SourceLocation EndLoc) : OMPExecutableDirective(OMPAssumeDirectiveClass, llvm::omp::OMPD_assume, - StartLoc, EndLoc) { } + StartLoc, EndLoc) {} explicit OMPAssumeDirective() : OMPExecutableDirective(OMPAssumeDirectiveClass, llvm::omp::OMPD_assume, - SourceLocation(), SourceLocation()) { } + SourceLocation(), SourceLocation()) {} public: static OMPAssumeDirective *Create(const ASTContext &Ctx, SourceLocation StartLoc, SourceLocation EndLoc, - ArrayRef<OMPClause *> Clauses, - Stmt *AStmt); + ArrayRef<OMPClause *> Clauses, Stmt *AStmt); static OMPAssumeDirective *CreateEmpty(const ASTContext &C, unsigned NumClauses, EmptyShell); diff --git a/clang/include/clang/Parse/Parser.h b/clang/include/clang/Parse/Parser.h index 70ab5e98d0..9509dc578f 100644 --- a/clang/include/clang/Parse/Parser.h +++ b/clang/include/clang/Parse/Parser.h @@ -3530,11 +3530,9 @@ private: OpenMPDirectiveKind DKind, SourceLocation Loc, bool ReadDirectiveWithinMetadirective); - StmtResult - ParseOpenMPInformationalDirective(ParsedStmtContext StmtCtx, - OpenMPDirectiveKind DKind, - SourceLocation Loc, - bool ReadDirectiveWithinMetadirective); + StmtResult ParseOpenMPInformationalDirective( + ParsedStmtContext StmtCtx, OpenMPDirectiveKind DKind, SourceLocation Loc, + bool ReadDirectiveWithinMetadirective); /// Parses clause of kind \a CKind for directive of a kind \a Kind. /// diff --git a/clang/include/clang/Sema/SemaOpenMP.h b/clang/include/clang/Sema/SemaOpenMP.h index 59df68cda4..2ba4a7e629 100644 --- a/clang/include/clang/Sema/SemaOpenMP.h +++ b/clang/include/clang/Sema/SemaOpenMP.h @@ -405,7 +405,8 @@ public: ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc, SourceLocation EndLoc); StmtResult ActOnOpenMPAssumeDirective(ArrayRef<OMPClause *> Clauses, - Stmt *AStmt, SourceLocation StartLoc, SourceLocation EndLoc); + Stmt *AStmt, SourceLocation StartLoc, + SourceLocation EndLoc); /// Called on well-formed '\#pragma omp parallel' after parsing /// of the associated statement. @@ -949,16 +950,16 @@ public: SourceLocation LParenLoc, SourceLocation EndLoc); /// Called on well-formed 'holds' clause. - OMPClause *ActOnOpenMPHoldsClause(Expr *E, - SourceLocation StartLoc, + OMPClause *ActOnOpenMPHoldsClause(Expr *E, SourceLocation StartLoc, SourceLocation LParenLoc, SourceLocation EndLoc); /// Called on well-formed 'absent' or 'contains' clauses. OMPClause *ActOnOpenMPDirectivePresenceClause( OpenMPClauseKind CK, llvm::SmallSet<OpenMPDirectiveKind, 4> &DKSet, SourceLocation Loc, SourceLocation LLoc, SourceLocation RLoc); - OMPClause *ActOnOpenMPNullaryAssumptionClause( - OpenMPClauseKind CK, SourceLocation Loc, SourceLocation RLoc); + OMPClause *ActOnOpenMPNullaryAssumptionClause(OpenMPClauseKind CK, + SourceLocation Loc, + SourceLocation RLoc); OMPClause *ActOnOpenMPSingleExprWithArgClause( OpenMPClauseKind Kind, ArrayRef<unsigned> Arguments, Expr *Expr, diff --git a/clang/lib/AST/StmtOpenMP.cpp b/clang/lib/AST/StmtOpenMP.cpp index 18fbf4222a..ff94114315 100644 --- a/clang/lib/AST/StmtOpenMP.cpp +++ b/clang/lib/AST/StmtOpenMP.cpp @@ -807,14 +807,15 @@ OMPAssumeDirective *OMPAssumeDirective::Create(const ASTContext &C, ArrayRef<OMPClause *> Clauses, Stmt *AStmt) { return createDirective<OMPAssumeDirective>(C, Clauses, AStmt, - /*NumChildren=*/0, StartLoc, EndLoc); + /*NumChildren=*/0, StartLoc, + EndLoc); } OMPAssumeDirective *OMPAssumeDirective::CreateEmpty(const ASTContext &C, unsigned NumClauses, EmptyShell) { - return createEmptyDirective<OMPAssumeDirective>(C, NumClauses, - /*HasAssociatedStmt=*/true); + return createEmptyDirective<OMPAssumeDirective>(C, NumClauses, + /*HasAssociatedStmt=*/true); } OMPErrorDirective *OMPErrorDirective::Create(const ASTContext &C, diff --git a/clang/lib/Parse/ParseOpenMP.cpp b/clang/lib/Parse/ParseOpenMP.cpp index 17e1bf497e..d9193fdc5a 100644 --- a/clang/lib/Parse/ParseOpenMP.cpp +++ b/clang/lib/Parse/ParseOpenMP.cpp @@ -25,8 +25,8 @@ #include "clang/Sema/SemaCodeCompletion.h" #include "clang/Sema/SemaOpenMP.h" #include "llvm/ADT/SmallBitVector.h" -#include "llvm/ADT/StringSwitch.h" #include "llvm/ADT/SmallSet.h" +#include "llvm/ADT/StringSwitch.h" #include "llvm/Frontend/OpenMP/OMPAssume.h" #include "llvm/Frontend/OpenMP/OMPContext.h" #include <optional> @@ -2581,7 +2581,8 @@ StmtResult Parser::ParseOpenMPExecutableDirective( StmtResult Parser::ParseOpenMPInformationalDirective( ParsedStmtContext StmtCtx, OpenMPDirectiveKind DKind, SourceLocation Loc, bool ReadDirectiveWithinMetadirective) { - assert(isOpenMPInformationalDirective(DKind) && "Unexpected directive category"); + assert(isOpenMPInformationalDirective(DKind) && + "Unexpected directive category"); bool HasAssociatedStatement = true; Association Assoc = getDirectiveAssociation(DKind); @@ -2604,8 +2605,8 @@ StmtResult Parser::ParseOpenMPInformationalDirective( } OpenMPClauseKind CKind = Tok.isAnnotation() - ? OMPC_unknown - : getOpenMPClauseKind(PP.getSpelling(Tok)); + ? OMPC_unknown + : getOpenMPClauseKind(PP.getSpelling(Tok)); Actions.OpenMP().StartOpenMPClause(CKind); OMPClause *Clause = ParseOpenMPClause(DKind, CKind, !SeenClauses[unsigned(CKind)]); @@ -2994,7 +2995,8 @@ StmtResult Parser::ParseOpenMPDeclarativeOrExecutableDirective( ConsumeToken(); Directive = ParseOpenMPInformationalDirective( StmtCtx, DKind, Loc, ReadDirectiveWithinMetadirective); - assert(!Directive.isUnset() && "Informational directive remains unprocessed"); + assert(!Directive.isUnset() && + "Informational directive remains unprocessed"); return Directive; } case OMPD_unknown: diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp index b97c0a66f3..fa3b90666a 100644 --- a/clang/lib/Sema/SemaOpenMP.cpp +++ b/clang/lib/Sema/SemaOpenMP.cpp @@ -3585,10 +3585,10 @@ void SemaOpenMP::ActOnOpenMPEndAssumesDirective() { OMPAssumeScoped.pop_back(); } -StmtResult -SemaOpenMP::ActOnOpenMPAssumeDirective(ArrayRef<OMPClause *> Clauses, - Stmt *AStmt, SourceLocation StartLoc, - SourceLocation EndLoc) { +StmtResult SemaOpenMP::ActOnOpenMPAssumeDirective(ArrayRef<OMPClause *> Clauses, + Stmt *AStmt, + SourceLocation StartLoc, + SourceLocation EndLoc) { if (!AStmt) return StmtError(); @@ -7036,9 +7036,10 @@ SemaOpenMP::DeclGroupPtrTy SemaOpenMP::ActOnOpenMPDeclareSimdDirective( StmtResult SemaOpenMP::ActOnOpenMPInformationalDirective( OpenMPDirectiveKind Kind, const DeclarationNameInfo &DirName, - ArrayRef<OMPClause *> Clauses, - Stmt *AStmt, SourceLocation StartLoc, SourceLocation EndLoc) { - assert(isOpenMPInformationalDirective(Kind) && "Unexpected directive category"); + ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc, + SourceLocation EndLoc) { + assert(isOpenMPInformationalDirective(Kind) && + "Unexpected directive category"); StmtResult Res = StmtError(); @@ -23286,26 +23287,27 @@ OMPClause *SemaOpenMP::ActOnOpenMPDirectivePresenceClause( OpenMPClauseKind CK, llvm::SmallSet<OpenMPDirectiveKind, 4> &DKSet, SourceLocation Loc, SourceLocation LLoc, SourceLocation RLoc) { switch (CK) { - case OMPC_absent: - return new (getASTContext()) OMPAbsentClause(DKSet, Loc, LLoc, RLoc); - case OMPC_contains: - return new (getASTContext()) OMPContainsClause(DKSet, Loc, LLoc, RLoc); - default: - llvm_unreachable("Unexpected OpenMP clause"); + case OMPC_absent: + return new (getASTContext()) OMPAbsentClause(DKSet, Loc, LLoc, RLoc); + case OMPC_contains: + return new (getASTContext()) OMPContainsClause(DKSet, Loc, LLoc, RLoc); + default: + llvm_unreachable("Unexpected OpenMP clause"); } } -OMPClause *SemaOpenMP::ActOnOpenMPNullaryAssumptionClause( - OpenMPClauseKind CK, SourceLocation Loc, SourceLocation RLoc) { +OMPClause *SemaOpenMP::ActOnOpenMPNullaryAssumptionClause(OpenMPClauseKind CK, + SourceLocation Loc, + SourceLocation RLoc) { switch (CK) { - case OMPC_no_openmp: - return new (getASTContext()) OMPNoOpenMPClause(Loc, RLoc); - case OMPC_no_openmp_routines: - return new (getASTContext()) OMPNoOpenMPRoutinesClause(Loc, RLoc); - case OMPC_no_parallelism: - return new (getASTContext()) OMPNoParallelismClause(Loc, RLoc); - default: - llvm_unreachable("Unexpected OpenMP clause"); + case OMPC_no_openmp: + return new (getASTContext()) OMPNoOpenMPClause(Loc, RLoc); + case OMPC_no_openmp_routines: + return new (getASTContext()) OMPNoOpenMPRoutinesClause(Loc, RLoc); + case OMPC_no_parallelism: + return new (getASTContext()) OMPNoParallelismClause(Loc, RLoc); + default: + llvm_unreachable("Unexpected OpenMP clause"); } } diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h index 6607a05e72..b27492d198 100644 --- a/clang/lib/Sema/TreeTransform.h +++ b/clang/lib/Sema/TreeTransform.h @@ -1681,10 +1681,12 @@ public: } /// Build a new OpenMP informational directive. - StmtResult RebuildOMPInformationalDirective( - OpenMPDirectiveKind Kind, DeclarationNameInfo DirName, - ArrayRef<OMPClause *> Clauses, Stmt *AStmt, SourceLocation StartLoc, - SourceLocation EndLoc) { + StmtResult RebuildOMPInformationalDirective(OpenMPDirectiveKind Kind, + DeclarationNameInfo DirName, + ArrayRef<OMPClause *> Clauses, + Stmt *AStmt, + SourceLocation StartLoc, + SourceLocation EndLoc) { return getSema().OpenMP().ActOnOpenMPInformationalDirective( Kind, DirName, Clauses, AStmt, StartLoc, EndLoc); @@ -10330,7 +10332,8 @@ OMPClause *TreeTransform<Derived>::TransformOMPFailClause(OMPFailClause *C) { } template <typename Derived> -OMPClause *TreeTransform<Derived>::TransformOMPAbsentClause(OMPAbsentClause *C) { +OMPClause * +TreeTransform<Derived>::TransformOMPAbsentClause(OMPAbsentClause *C) { return C; } @@ -10339,17 +10342,19 @@ OMPClause *TreeTransform<Derived>::TransformOMPHoldsClause(OMPHoldsClause *C) { ExprResult E = getDerived().TransformExpr(C->getExpr()); if (E.isInvalid()) return nullptr; - return getDerived().RebuildOMPHoldsClause( - E.get(), C->getBeginLoc(), C->getLParenLoc(), C->getEndLoc()); + return getDerived().RebuildOMPHoldsClause(E.get(), C->getBeginLoc(), + C->getLParenLoc(), C->getEndLoc()); } template <typename Derived> -OMPClause *TreeTransform<Derived>::TransformOMPContainsClause(OMPContainsClause *C) { +OMPClause * +TreeTransform<Derived>::TransformOMPContainsClause(OMPContainsClause *C) { return C; } template <typename Derived> -OMPClause *TreeTransform<Derived>::TransformOMPNoOpenMPClause(OMPNoOpenMPClause *C) { +OMPClause * +TreeTransform<Derived>::TransformOMPNoOpenMPClause(OMPNoOpenMPClause *C) { return C; } template <typename Derived> diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp index 5d0274438c..3a6667aaa3 100644 --- a/clang/lib/Serialization/ASTWriter.cpp +++ b/clang/lib/Serialization/ASTWriter.cpp @@ -7228,7 +7228,7 @@ void OMPClauseWriter::VisitOMPContainsClause(OMPContainsClause *C) { void OMPClauseWriter::VisitOMPNoOpenMPClause(OMPNoOpenMPClause *) {} void OMPClauseWriter::VisitOMPNoOpenMPRoutinesClause( - OMPNoOpenMPRoutinesClause *) {} + OMPNoOpenMPRoutinesClause *) {} void OMPClauseWriter::VisitOMPNoParallelismClause(OMPNoParallelismClause *) {} diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp index 043246231b..7e53c346ed 100644 --- a/clang/tools/libclang/CIndex.cpp +++ b/clang/tools/libclang/CIndex.cpp @@ -2434,9 +2434,11 @@ void OMPClauseEnqueue::VisitOMPContainsClause(const OMPContainsClause *) {} void OMPClauseEnqueue::VisitOMPNoOpenMPClause(const OMPNoOpenMPClause *) {} -void OMPClauseEnqueue::VisitOMPNoOpenMPRoutinesClause(const OMPNoOpenMPRoutinesClause *) {} +void OMPClauseEnqueue::VisitOMPNoOpenMPRoutinesClause( + const OMPNoOpenMPRoutinesClause *) {} -void OMPClauseEnqueue::VisitOMPNoParallelismClause(const OMPNoParallelismClause *) {} +void OMPClauseEnqueue::VisitOMPNoParallelismClause( + const OMPNoParallelismClause *) {} void OMPClauseEnqueue::VisitOMPSeqCstClause(const OMPSeqCstClause *) {} `````````` </details> https://github.com/llvm/llvm-project/pull/92731 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits