From 9d168222249a89dab2a48069137157eb8c3f1d06 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Fri, 5 Aug 2016 17:44:54 +0000 Subject: [PATCH] [SemaOpenMP] Some miscellaneous cleanups Clean up some typos, follow the coding style a little more rigorously. No functionality change is intended. llvm-svn: 277840 --- clang/lib/Sema/SemaOpenMP.cpp | 281 +++++++++++++++++----------------- 1 file changed, 139 insertions(+), 142 deletions(-) diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp index 8194e161eae8..5cbcea4cce31 100644 --- a/clang/lib/Sema/SemaOpenMP.cpp +++ b/clang/lib/Sema/SemaOpenMP.cpp @@ -128,7 +128,7 @@ private: typedef SmallVector::reverse_iterator reverse_iterator; - DSAVarData getDSA(StackTy::reverse_iterator& Iter, ValueDecl *D); + DSAVarData getDSA(StackTy::reverse_iterator &Iter, ValueDecl *D); /// \brief Checks if the variable is a local for OpenMP region. bool isOpenMPLocal(VarDecl *D, StackTy::reverse_iterator Iter); @@ -298,9 +298,7 @@ public: Stack[Stack.size() - 2].CancelRegion || Cancel; } /// \brief Return true if current region has inner cancel construct. - bool isCancelRegion() const { - return Stack.back().CancelRegion; - } + bool isCancelRegion() const { return Stack.back().CancelRegion; } /// \brief Set collapse value for the region. void setAssociatedLoops(unsigned Val) { Stack.back().AssociatedLoops = Val; } @@ -401,7 +399,7 @@ bool isParallelOrTaskRegion(OpenMPDirectiveKind DKind) { static ValueDecl *getCanonicalDecl(ValueDecl *D) { auto *VD = dyn_cast(D); auto *FD = dyn_cast(D); - if (VD != nullptr) { + if (VD != nullptr) { VD = VD->getCanonicalDecl(); D = VD; } else { @@ -412,7 +410,7 @@ static ValueDecl *getCanonicalDecl(ValueDecl *D) { return D; } -DSAStackTy::DSAVarData DSAStackTy::getDSA(StackTy::reverse_iterator& Iter, +DSAStackTy::DSAVarData DSAStackTy::getDSA(StackTy::reverse_iterator &Iter, ValueDecl *D) { D = getCanonicalDecl(D); auto *VD = dyn_cast(D); @@ -905,7 +903,6 @@ bool Sema::IsOpenMPCapturedByRef(ValueDecl *D, unsigned Level) { // array section, the runtime library may pass the NULL value to the // device instead of the value passed to it by the compiler. - if (Ty->isReferenceType()) Ty = Ty->castAs()->getPointeeType(); @@ -1070,7 +1067,7 @@ void Sema::EndOpenMPDSABlock(Stmt *CurDirective) { // clause requires an accessible, unambiguous default constructor for the // class type, unless the list item is also specified in a firstprivate // clause. - if (auto D = dyn_cast_or_null(CurDirective)) { + if (auto *D = dyn_cast_or_null(CurDirective)) { for (auto *C : D->clauses()) { if (auto *Clause = dyn_cast(C)) { SmallVector PrivateCopies; @@ -1129,7 +1126,7 @@ public: explicit VarDeclFilterCCC(Sema &S) : SemaRef(S) {} bool ValidateCandidate(const TypoCorrection &Candidate) override { NamedDecl *ND = Candidate.getCorrectionDecl(); - if (VarDecl *VD = dyn_cast_or_null(ND)) { + if (auto *VD = dyn_cast_or_null(ND)) { return VD->hasGlobalStorage() && SemaRef.isDeclInScope(ND, SemaRef.getCurLexicalContext(), SemaRef.getCurScope()); @@ -1298,7 +1295,7 @@ class LocalVarRefChecker : public ConstStmtVisitor { public: bool VisitDeclRefExpr(const DeclRefExpr *E) { - if (auto VD = dyn_cast(E->getDecl())) { + if (auto *VD = dyn_cast(E->getDecl())) { if (VD->hasLocalStorage()) { SemaRef.Diag(E->getLocStart(), diag::err_omp_local_var_in_threadprivate_init) @@ -1479,7 +1476,8 @@ public: auto DVar = Stack->getTopDSA(VD, false); // Check if the variable has explicit DSA set and stop analysis if it so. - if (DVar.RefExpr) return; + if (DVar.RefExpr) + return; auto ELoc = E->getExprLoc(); auto DKind = Stack->getCurrentDirective(); @@ -3261,7 +3259,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, auto OffendingRegion = ParentRegion; bool NestingProhibited = false; bool CloseNesting = true; - bool OrphanSeen = false; + bool OrphanSeen = false; enum { NoRecommend, ShouldBeInParallelRegion, @@ -3275,7 +3273,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // OpenMP [2.8.1,simd Construct, Restrictions] // An ordered construct with the simd clause is the only OpenMP // construct that can appear in the simd region. - // Allowing a SIMD consruct nested in another SIMD construct is an + // Allowing a SIMD construct nested in another SIMD construct is an // extension. The OpenMP 4.5 spec does not allow it. Issue a warning // message. SemaRef.Diag(StartLoc, (CurrentRegion != OMPD_simd) @@ -3304,7 +3302,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, return false; } // Allow some constructs (except teams) to be orphaned (they could be - // used in functions, called from OpenMP regions with the required + // used in functions, called from OpenMP regions with the required // preconditions). if (ParentRegion == OMPD_unknown && !isOpenMPTeamsDirective(CurrentRegion)) return false; @@ -3344,20 +3342,17 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, // critical region with the same name. Note that this restriction is not // sufficient to prevent deadlock. SourceLocation PreviousCriticalLoc; - bool DeadLock = - Stack->hasDirective([CurrentName, &PreviousCriticalLoc]( - OpenMPDirectiveKind K, - const DeclarationNameInfo &DNI, - SourceLocation Loc) - ->bool { - if (K == OMPD_critical && - DNI.getName() == CurrentName.getName()) { - PreviousCriticalLoc = Loc; - return true; - } else - return false; - }, - false /* skip top directive */); + bool DeadLock = Stack->hasDirective( + [CurrentName, &PreviousCriticalLoc](OpenMPDirectiveKind K, + const DeclarationNameInfo &DNI, + SourceLocation Loc) -> bool { + if (K == OMPD_critical && DNI.getName() == CurrentName.getName()) { + PreviousCriticalLoc = Loc; + return true; + } else + return false; + }, + false /* skip top directive */); if (DeadLock) { SemaRef.Diag(StartLoc, diag::err_omp_prohibited_region_critical_same_name) @@ -3419,7 +3414,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack, !isOpenMPDistributeDirective(CurrentRegion); Recommend = ShouldBeInParallelRegion; } - if (!NestingProhibited && + if (!NestingProhibited && isOpenMPNestingDistributeDirective(CurrentRegion)) { // OpenMP 4.5 [2.17 Nesting of Regions] // The region associated with the distribute construct must be strictly @@ -3775,9 +3770,8 @@ StmtResult Sema::ActOnOpenMPExecutableDirective( AllowedNameModifiers.push_back(OMPD_target); break; case OMPD_teams_distribute: - Res = ActOnOpenMPTeamsDistributeDirective(ClausesWithImplicit, AStmt, - StartLoc, EndLoc, - VarsWithInheritedDSA); + Res = ActOnOpenMPTeamsDistributeDirective( + ClausesWithImplicit, AStmt, StartLoc, EndLoc, VarsWithInheritedDSA); break; case OMPD_declare_target: case OMPD_end_declare_target: @@ -4146,7 +4140,7 @@ public: /// \brief Build reference expression to the private counter be used for /// codegen. Expr *BuildPrivateCounterVar() const; - /// \brief Build initization of the counter be used for codegen. + /// \brief Build initialization of the counter be used for codegen. Expr *BuildCounterInit() const; /// \brief Build step of the counter be used for codegen. Expr *BuildCounterStep() const; @@ -4271,8 +4265,9 @@ bool OpenMPIterationSpaceChecker::SetStep(Expr *NewStep, bool Subtract) { return true; } if (TestIsLessOp == Subtract) { - NewStep = SemaRef.CreateBuiltinUnaryOp(NewStep->getExprLoc(), UO_Minus, - NewStep).get(); + NewStep = + SemaRef.CreateBuiltinUnaryOp(NewStep->getExprLoc(), UO_Minus, NewStep) + .get(); Subtract = !Subtract; } } @@ -4304,7 +4299,7 @@ bool OpenMPIterationSpaceChecker::CheckInit(Stmt *S, bool EmitDiags) { InitSrcRange = S->getSourceRange(); if (Expr *E = dyn_cast(S)) S = E->IgnoreParens(); - if (auto BO = dyn_cast(S)) { + if (auto *BO = dyn_cast(S)) { if (BO->getOpcode() == BO_Assign) { auto *LHS = BO->getLHS()->IgnoreParens(); if (auto *DRE = dyn_cast(LHS)) { @@ -4319,9 +4314,9 @@ bool OpenMPIterationSpaceChecker::CheckInit(Stmt *S, bool EmitDiags) { return SetLCDeclAndLB(ME->getMemberDecl(), ME, BO->getRHS()); } } - } else if (auto DS = dyn_cast(S)) { + } else if (auto *DS = dyn_cast(S)) { if (DS->isSingleDecl()) { - if (auto Var = dyn_cast_or_null(DS->getSingleDecl())) { + if (auto *Var = dyn_cast_or_null(DS->getSingleDecl())) { if (Var->hasInit() && !Var->getType()->isReferenceType()) { // Accept non-canonical init form here but emit ext. warning. if (Var->getInitStyle() != VarDecl::CInit && EmitDiags) @@ -4332,10 +4327,10 @@ bool OpenMPIterationSpaceChecker::CheckInit(Stmt *S, bool EmitDiags) { } } } - } else if (auto CE = dyn_cast(S)) { + } else if (auto *CE = dyn_cast(S)) { if (CE->getOperator() == OO_Equal) { auto *LHS = CE->getArg(0); - if (auto DRE = dyn_cast(LHS)) { + if (auto *DRE = dyn_cast(LHS)) { if (auto *CED = dyn_cast(DRE->getDecl())) if (auto *ME = dyn_cast(getExprAsWritten(CED->getInit()))) return SetLCDeclAndLB(ME->getMemberDecl(), ME, BO->getRHS()); @@ -4397,7 +4392,7 @@ bool OpenMPIterationSpaceChecker::CheckCond(Expr *S) { } S = getExprAsWritten(S); SourceLocation CondLoc = S->getLocStart(); - if (auto BO = dyn_cast(S)) { + if (auto *BO = dyn_cast(S)) { if (BO->isRelationalOp()) { if (GetInitLCDecl(BO->getLHS()) == LCDecl) return SetUB(BO->getRHS(), @@ -4410,7 +4405,7 @@ bool OpenMPIterationSpaceChecker::CheckCond(Expr *S) { (BO->getOpcode() == BO_LT || BO->getOpcode() == BO_GT), BO->getSourceRange(), BO->getOperatorLoc()); } - } else if (auto CE = dyn_cast(S)) { + } else if (auto *CE = dyn_cast(S)) { if (CE->getNumArgs() == 2) { auto Op = CE->getOperator(); switch (Op) { @@ -4446,7 +4441,7 @@ bool OpenMPIterationSpaceChecker::CheckIncRHS(Expr *RHS) { // var - incr // RHS = RHS->IgnoreParenImpCasts(); - if (auto BO = dyn_cast(RHS)) { + if (auto *BO = dyn_cast(RHS)) { if (BO->isAdditiveOp()) { bool IsAdd = BO->getOpcode() == BO_Add; if (GetInitLCDecl(BO->getLHS()) == LCDecl) @@ -4454,7 +4449,7 @@ bool OpenMPIterationSpaceChecker::CheckIncRHS(Expr *RHS) { if (IsAdd && GetInitLCDecl(BO->getRHS()) == LCDecl) return SetStep(BO->getLHS(), false); } - } else if (auto CE = dyn_cast(RHS)) { + } else if (auto *CE = dyn_cast(RHS)) { bool IsAdd = CE->getOperator() == OO_Plus; if ((IsAdd || CE->getOperator() == OO_Minus) && CE->getNumArgs() == 2) { if (GetInitLCDecl(CE->getArg(0)) == LCDecl) @@ -4494,14 +4489,15 @@ bool OpenMPIterationSpaceChecker::CheckInc(Expr *S) { IncrementSrcRange = S->getSourceRange(); S = S->IgnoreParens(); - if (auto UO = dyn_cast(S)) { + if (auto *UO = dyn_cast(S)) { if (UO->isIncrementDecrementOp() && GetInitLCDecl(UO->getSubExpr()) == LCDecl) - return SetStep( - SemaRef.ActOnIntegerConstant(UO->getLocStart(), - (UO->isDecrementOp() ? -1 : 1)).get(), - false); - } else if (auto BO = dyn_cast(S)) { + return SetStep(SemaRef + .ActOnIntegerConstant(UO->getLocStart(), + (UO->isDecrementOp() ? -1 : 1)) + .get(), + false); + } else if (auto *BO = dyn_cast(S)) { switch (BO->getOpcode()) { case BO_AddAssign: case BO_SubAssign: @@ -4515,16 +4511,17 @@ bool OpenMPIterationSpaceChecker::CheckInc(Expr *S) { default: break; } - } else if (auto CE = dyn_cast(S)) { + } else if (auto *CE = dyn_cast(S)) { switch (CE->getOperator()) { case OO_PlusPlus: case OO_MinusMinus: if (GetInitLCDecl(CE->getArg(0)) == LCDecl) - return SetStep( - SemaRef.ActOnIntegerConstant( - CE->getLocStart(), - ((CE->getOperator() == OO_MinusMinus) ? -1 : 1)).get(), - false); + return SetStep(SemaRef + .ActOnIntegerConstant( + CE->getLocStart(), + ((CE->getOperator() == OO_MinusMinus) ? -1 : 1)) + .get(), + false); break; case OO_PlusEqual: case OO_MinusEqual: @@ -4721,7 +4718,7 @@ Expr *OpenMPIterationSpaceChecker::BuildPrivateCounterVar() const { return nullptr; } -/// \brief Build initization of the counter be used for codegen. +/// \brief Build instillation of the counter be used for codegen. Expr *OpenMPIterationSpaceChecker::BuildCounterInit() const { return LB; } /// \brief Build step of the counter be used for codegen. @@ -4792,7 +4789,7 @@ static bool CheckOpenMPIterationSpace( llvm::MapVector &Captures) { // OpenMP [2.6, Canonical Loop Form] // for (init-expr; test-expr; incr-expr) structured-block - auto For = dyn_cast_or_null(S); + auto *For = dyn_cast_or_null(S); if (!For) { SemaRef.Diag(S->getLocStart(), diag::err_omp_not_for) << (CollapseLoopCountExpr != nullptr || OrderedLoopCountExpr != nullptr) @@ -5032,8 +5029,7 @@ BuildCounterUpdate(Sema &SemaRef, Scope *S, SourceLocation Loc, /// \brief Convert integer expression \a E to make it have at least \a Bits /// bits. -static ExprResult WidenIterationCount(unsigned Bits, Expr *E, - Sema &SemaRef) { +static ExprResult WidenIterationCount(unsigned Bits, Expr *E, Sema &SemaRef) { if (E == nullptr) return ExprError(); auto &C = SemaRef.Context; @@ -5191,15 +5187,17 @@ CheckOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, auto PreCond = ExprResult(IterSpaces[0].PreCond); auto N0 = IterSpaces[0].NumIterations; ExprResult LastIteration32 = WidenIterationCount( - 32 /* Bits */, SemaRef.PerformImplicitConversion( - N0->IgnoreImpCasts(), N0->getType(), - Sema::AA_Converting, /*AllowExplicit=*/true) + 32 /* Bits */, SemaRef + .PerformImplicitConversion( + N0->IgnoreImpCasts(), N0->getType(), + Sema::AA_Converting, /*AllowExplicit=*/true) .get(), SemaRef); ExprResult LastIteration64 = WidenIterationCount( - 64 /* Bits */, SemaRef.PerformImplicitConversion( - N0->IgnoreImpCasts(), N0->getType(), - Sema::AA_Converting, /*AllowExplicit=*/true) + 64 /* Bits */, SemaRef + .PerformImplicitConversion( + N0->IgnoreImpCasts(), N0->getType(), + Sema::AA_Converting, /*AllowExplicit=*/true) .get(), SemaRef); @@ -5220,16 +5218,18 @@ CheckOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, if (LastIteration32.isUsable()) LastIteration32 = SemaRef.BuildBinOp( CurScope, SourceLocation(), BO_Mul, LastIteration32.get(), - SemaRef.PerformImplicitConversion(N->IgnoreImpCasts(), N->getType(), - Sema::AA_Converting, - /*AllowExplicit=*/true) + SemaRef + .PerformImplicitConversion(N->IgnoreImpCasts(), N->getType(), + Sema::AA_Converting, + /*AllowExplicit=*/true) .get()); if (LastIteration64.isUsable()) LastIteration64 = SemaRef.BuildBinOp( CurScope, SourceLocation(), BO_Mul, LastIteration64.get(), - SemaRef.PerformImplicitConversion(N->IgnoreImpCasts(), N->getType(), - Sema::AA_Converting, - /*AllowExplicit=*/true) + SemaRef + .PerformImplicitConversion(N->IgnoreImpCasts(), N->getType(), + Sema::AA_Converting, + /*AllowExplicit=*/true) .get()); } @@ -5287,7 +5287,7 @@ CheckOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, SourceLocation InitLoc = IterSpaces[0].InitSrcRange.getBegin(); - // Build variables passed into runtime, nesessary for worksharing directives. + // Build variables passed into runtime, necessary for worksharing directives. ExprResult LB, UB, IL, ST, EUB, PrevLB, PrevUB; if (isOpenMPWorksharingDirective(DKind) || isOpenMPTaskLoopDirective(DKind) || isOpenMPDistributeDirective(DKind)) { @@ -5323,7 +5323,7 @@ CheckOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, /*DirectInit*/ false, /*TypeMayContainAuto*/ false); // Build expression: UB = min(UB, LastIteration) - // It is nesessary for CodeGen of directives with static scheduling. + // It is necessary for CodeGen of directives with static scheduling. ExprResult IsUBGreater = SemaRef.BuildBinOp(CurScope, InitLoc, BO_GT, UB.get(), LastIteration.get()); ExprResult CondOp = SemaRef.ActOnConditionalOp( @@ -5364,11 +5364,11 @@ CheckOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, { VarDecl *IVDecl = buildVarDecl(SemaRef, InitLoc, RealVType, ".omp.iv"); IV = buildDeclRefExpr(SemaRef, IVDecl, RealVType, InitLoc); - Expr *RHS = (isOpenMPWorksharingDirective(DKind) || - isOpenMPTaskLoopDirective(DKind) || - isOpenMPDistributeDirective(DKind)) - ? LB.get() - : SemaRef.ActOnIntegerConstant(SourceLocation(), 0).get(); + Expr *RHS = + (isOpenMPWorksharingDirective(DKind) || + isOpenMPTaskLoopDirective(DKind) || isOpenMPDistributeDirective(DKind)) + ? LB.get() + : SemaRef.ActOnIntegerConstant(SourceLocation(), 0).get(); Init = SemaRef.BuildBinOp(CurScope, InitLoc, BO_Assign, IV.get(), RHS); Init = SemaRef.ActOnFinishFullExpr(Init.get()); } @@ -5571,9 +5571,10 @@ CheckOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, } assert(I->second == OO_Plus || I->second == OO_Minus); BinaryOperatorKind BOK = (I->second == OO_Plus) ? BO_Add : BO_Sub; - UpCounterVal = - SemaRef.BuildBinOp(CurScope, I->first->getExprLoc(), BOK, - UpCounterVal, NormalizedOffset).get(); + UpCounterVal = SemaRef + .BuildBinOp(CurScope, I->first->getExprLoc(), BOK, + UpCounterVal, NormalizedOffset) + .get(); } Multiplier = *ILM; ++I; @@ -5668,7 +5669,7 @@ StmtResult Sema::ActOnOpenMPSimdDirective( if (!CurContext->isDependentContext()) { // Finalize the clauses that need pre-built expressions for CodeGen. for (auto C : Clauses) { - if (auto LC = dyn_cast(C)) + if (auto *LC = dyn_cast(C)) if (FinishOpenMPLinearClause(*LC, cast(B.IterationVarRef), B.NumIterations, *this, CurScope, DSAStack)) @@ -5707,7 +5708,7 @@ StmtResult Sema::ActOnOpenMPForDirective( if (!CurContext->isDependentContext()) { // Finalize the clauses that need pre-built expressions for CodeGen. for (auto C : Clauses) { - if (auto LC = dyn_cast(C)) + if (auto *LC = dyn_cast(C)) if (FinishOpenMPLinearClause(*LC, cast(B.IterationVarRef), B.NumIterations, *this, CurScope, DSAStack)) @@ -5744,7 +5745,7 @@ StmtResult Sema::ActOnOpenMPForSimdDirective( if (!CurContext->isDependentContext()) { // Finalize the clauses that need pre-built expressions for CodeGen. for (auto C : Clauses) { - if (auto LC = dyn_cast(C)) + if (auto *LC = dyn_cast(C)) if (FinishOpenMPLinearClause(*LC, cast(B.IterationVarRef), B.NumIterations, *this, CurScope, DSAStack)) @@ -5769,9 +5770,9 @@ StmtResult Sema::ActOnOpenMPSectionsDirective(ArrayRef Clauses, assert(isa(AStmt) && "Captured statement expected"); auto BaseStmt = AStmt; - while (CapturedStmt *CS = dyn_cast_or_null(BaseStmt)) + while (auto *CS = dyn_cast_or_null(BaseStmt)) BaseStmt = CS->getCapturedStmt(); - if (auto C = dyn_cast_or_null(BaseStmt)) { + if (auto *C = dyn_cast_or_null(BaseStmt)) { auto S = C->children(); if (S.begin() == S.end()) return StmtError(); @@ -5946,7 +5947,7 @@ StmtResult Sema::ActOnOpenMPParallelForDirective( if (!CurContext->isDependentContext()) { // Finalize the clauses that need pre-built expressions for CodeGen. for (auto C : Clauses) { - if (auto LC = dyn_cast(C)) + if (auto *LC = dyn_cast(C)) if (FinishOpenMPLinearClause(*LC, cast(B.IterationVarRef), B.NumIterations, *this, CurScope, DSAStack)) @@ -5988,7 +5989,7 @@ StmtResult Sema::ActOnOpenMPParallelForSimdDirective( if (!CurContext->isDependentContext()) { // Finalize the clauses that need pre-built expressions for CodeGen. for (auto C : Clauses) { - if (auto LC = dyn_cast(C)) + if (auto *LC = dyn_cast(C)) if (FinishOpenMPLinearClause(*LC, cast(B.IterationVarRef), B.NumIterations, *this, CurScope, DSAStack)) @@ -6013,9 +6014,9 @@ Sema::ActOnOpenMPParallelSectionsDirective(ArrayRef Clauses, assert(isa(AStmt) && "Captured statement expected"); auto BaseStmt = AStmt; - while (CapturedStmt *CS = dyn_cast_or_null(BaseStmt)) + while (auto *CS = dyn_cast_or_null(BaseStmt)) BaseStmt = CS->getCapturedStmt(); - if (auto C = dyn_cast_or_null(BaseStmt)) { + if (auto *C = dyn_cast_or_null(BaseStmt)) { auto S = C->children(); if (S.begin() == S.end()) return StmtError(); @@ -6049,7 +6050,7 @@ StmtResult Sema::ActOnOpenMPTaskDirective(ArrayRef Clauses, if (!AStmt) return StmtError(); - CapturedStmt *CS = cast(AStmt); + auto *CS = cast(AStmt); // 1.2.2 OpenMP Language Terminology // Structured block - An executable statement with a single entry at the // top and a single exit at the bottom. @@ -6351,10 +6352,10 @@ bool OpenMPAtomicUpdateChecker::checkStatement(Stmt *S, unsigned DiagId, } else if (auto *AtomicBinOp = dyn_cast( AtomicBody->IgnoreParenImpCasts())) { // Check for Binary Operation - if(checkBinaryOperation(AtomicBinOp, DiagId, NoteId)) + if (checkBinaryOperation(AtomicBinOp, DiagId, NoteId)) return true; - } else if (auto *AtomicUnaryOp = - dyn_cast(AtomicBody->IgnoreParenImpCasts())) { + } else if (auto *AtomicUnaryOp = dyn_cast( + AtomicBody->IgnoreParenImpCasts())) { // Check for Unary Operation if (AtomicUnaryOp->isIncrementDecrementOp()) { IsPostfixUpdate = AtomicUnaryOp->isPostfix(); @@ -6420,7 +6421,7 @@ StmtResult Sema::ActOnOpenMPAtomicDirective(ArrayRef Clauses, if (!AStmt) return StmtError(); - auto CS = cast(AStmt); + auto *CS = cast(AStmt); // 1.2.2 OpenMP Language Terminology // Structured block - An executable statement with a single entry at the // top and a single exit at the bottom. @@ -6488,8 +6489,8 @@ StmtResult Sema::ActOnOpenMPAtomicDirective(ArrayRef Clauses, SourceRange ErrorRange, NoteRange; // If clause is read: // v = x; - if (auto AtomicBody = dyn_cast(Body)) { - auto AtomicBinOp = + if (auto *AtomicBody = dyn_cast(Body)) { + auto *AtomicBinOp = dyn_cast(AtomicBody->IgnoreParenImpCasts()); if (AtomicBinOp && AtomicBinOp->getOpcode() == BO_Assign) { X = AtomicBinOp->getRHS()->IgnoreParenImpCasts(); @@ -6550,8 +6551,8 @@ StmtResult Sema::ActOnOpenMPAtomicDirective(ArrayRef Clauses, SourceRange ErrorRange, NoteRange; // If clause is write: // x = expr; - if (auto AtomicBody = dyn_cast(Body)) { - auto AtomicBinOp = + if (auto *AtomicBody = dyn_cast(Body)) { + auto *AtomicBinOp = dyn_cast(AtomicBody->IgnoreParenImpCasts()); if (AtomicBinOp && AtomicBinOp->getOpcode() == BO_Assign) { X = AtomicBinOp->getLHS(); @@ -6869,7 +6870,7 @@ StmtResult Sema::ActOnOpenMPTargetDirective(ArrayRef Clauses, if (auto *CS = dyn_cast(S)) { auto I = CS->body_begin(); while (I != CS->body_end()) { - auto OED = dyn_cast(*I); + auto *OED = dyn_cast(*I); if (!OED || !isOpenMPTeamsDirective(OED->getDirectiveKind())) { OMPTeamsFound = false; break; @@ -6949,7 +6950,7 @@ StmtResult Sema::ActOnOpenMPTargetParallelForDirective( if (!CurContext->isDependentContext()) { // Finalize the clauses that need pre-built expressions for CodeGen. for (auto C : Clauses) { - if (auto LC = dyn_cast(C)) + if (auto *LC = dyn_cast(C)) if (FinishOpenMPLinearClause(*LC, cast(B.IterationVarRef), B.NumIterations, *this, CurScope, DSAStack)) @@ -6987,8 +6988,8 @@ StmtResult Sema::ActOnOpenMPTargetDataDirective(ArrayRef Clauses, // OpenMP [2.10.1, Restrictions, p. 97] // At least one map clause must appear on the directive. if (!HasMapClause(Clauses)) { - Diag(StartLoc, diag::err_omp_no_map_for_directive) << - getOpenMPDirectiveName(OMPD_target_data); + Diag(StartLoc, diag::err_omp_no_map_for_directive) + << getOpenMPDirectiveName(OMPD_target_data); return StmtError(); } @@ -7188,7 +7189,7 @@ StmtResult Sema::ActOnOpenMPTaskLoopSimdDirective( if (!CurContext->isDependentContext()) { // Finalize the clauses that need pre-built expressions for CodeGen. for (auto C : Clauses) { - if (auto LC = dyn_cast(C)) + if (auto *LC = dyn_cast(C)) if (FinishOpenMPLinearClause(*LC, cast(B.IterationVarRef), B.NumIterations, *this, CurScope, DSAStack)) @@ -7369,7 +7370,7 @@ StmtResult Sema::ActOnOpenMPTargetParallelForSimdDirective( if (!CurContext->isDependentContext()) { // Finalize the clauses that need pre-built expressions for CodeGen. for (auto C : Clauses) { - if (auto LC = dyn_cast(C)) + if (auto *LC = dyn_cast(C)) if (FinishOpenMPLinearClause(*LC, cast(B.IterationVarRef), B.NumIterations, *this, CurScope, DSAStack)) @@ -7402,7 +7403,7 @@ StmtResult Sema::ActOnOpenMPTargetSimdDirective( OMPLoopDirective::HelperExprs B; // In presence of clause 'collapse' with number of loops, it will define the // nested loops number. - unsigned NestedLoopCount = + unsigned NestedLoopCount = CheckOpenMPLoop(OMPD_target_simd, getCollapseNumberExpr(Clauses), getOrderedNumberExpr(Clauses), AStmt, *this, *DSAStack, VarsWithImplicitDSA, B); @@ -7415,7 +7416,7 @@ StmtResult Sema::ActOnOpenMPTargetSimdDirective( if (!CurContext->isDependentContext()) { // Finalize the clauses that need pre-built expressions for CodeGen. for (auto C : Clauses) { - if (auto LC = dyn_cast(C)) + if (auto *LC = dyn_cast(C)) if (FinishOpenMPLinearClause(*LC, cast(B.IterationVarRef), B.NumIterations, *this, CurScope, DSAStack)) @@ -7460,9 +7461,8 @@ StmtResult Sema::ActOnOpenMPTeamsDistributeDirective( "omp teams distribute loop exprs were not built"); getCurFunction()->setHasBranchProtectedScope(); - return OMPTeamsDistributeDirective::Create(Context, StartLoc, EndLoc, - NestedLoopCount, Clauses, AStmt, - B); + return OMPTeamsDistributeDirective::Create( + Context, StartLoc, EndLoc, NestedLoopCount, Clauses, AStmt, B); } OMPClause *Sema::ActOnOpenMPSingleExprClause(OpenMPClauseKind Kind, Expr *Expr, @@ -7941,8 +7941,8 @@ OMPClause *Sema::ActOnOpenMPSingleExprWithArgClause( Res = ActOnOpenMPDefaultmapClause( static_cast(Argument[Modifier]), static_cast(Argument[DefaultmapKind]), - StartLoc, LParenLoc, ArgumentLoc[Modifier], - ArgumentLoc[DefaultmapKind], EndLoc); + StartLoc, LParenLoc, ArgumentLoc[Modifier], ArgumentLoc[DefaultmapKind], + EndLoc); break; case OMPC_final: case OMPC_num_threads: @@ -8283,7 +8283,7 @@ OMPClause *Sema::ActOnOpenMPVarListClause( Res = ActOnOpenMPFlushClause(VarList, StartLoc, LParenLoc, EndLoc); break; case OMPC_depend: - Res = ActOnOpenMPDependClause(DepKind, DepLinMapLoc, ColonLoc, VarList, + Res = ActOnOpenMPDependClause(DepKind, DepLinMapLoc, ColonLoc, VarList, StartLoc, LParenLoc, EndLoc); break; case OMPC_map: @@ -8486,7 +8486,7 @@ OMPClause *Sema::ActOnOpenMPPrivateClause(ArrayRef VarList, if (DSAStack->getCurrentDirective() == OMPD_target) { OpenMPClauseKind ConflictKind; if (DSAStack->checkMappableExprComponentListsForDecl( - VD, /* CurrentRegionOnly = */ true, + VD, /*CurrentRegionOnly=*/true, [&](OMPClauseMappableExprCommon::MappableExprComponentListRef, OpenMPClauseKind WhereFoundClauseKind) -> bool { ConflictKind = WhereFoundClauseKind; @@ -8742,7 +8742,7 @@ OMPClause *Sema::ActOnOpenMPFirstprivateClause(ArrayRef VarList, if (CurrDir == OMPD_target) { OpenMPClauseKind ConflictKind; if (DSAStack->checkMappableExprComponentListsForDecl( - VD, /* CurrentRegionOnly = */ true, + VD, /*CurrentRegionOnly=*/true, [&](OMPClauseMappableExprCommon::MappableExprComponentListRef, OpenMPClauseKind WhereFoundClauseKind) -> bool { ConflictKind = WhereFoundClauseKind; @@ -9152,7 +9152,7 @@ buildDeclareReductionRef(Sema &SemaRef, SourceLocation Loc, SourceRange Range, cast_or_null(UnresolvedReduction)) { Lookups.push_back(UnresolvedSet<8>()); Decl *PrevD = nullptr; - for(auto *D : ULE->decls()) { + for (auto *D : ULE->decls()) { if (D == PrevD) Lookups.push_back(UnresolvedSet<8>()); else if (auto *DRD = cast(D)) @@ -9528,7 +9528,7 @@ OMPClause *Sema::ActOnOpenMPReductionClause( if (OASE || (!ASE && D->getType().getNonReferenceType()->isVariablyModifiedType())) { - // For arays/array sections only: + // For arrays/array sections only: // Create pseudo array type for private copy. The size for this array will // be generated during codegen. // For array subscripts or single variables Private Ty is the same as Type @@ -10006,7 +10006,7 @@ static bool FinishOpenMPLinearClause(OMPLinearClause &Clause, DeclRefExpr *IV, Expr *InitExpr = *CurInit; // Build privatized reference to the current linear var. - auto DE = cast(SimpleRefExpr); + auto *DE = cast(SimpleRefExpr); Expr *CapturedRef; if (LinKind == OMPC_LINEAR_uval) CapturedRef = cast(DE->getDecl())->getInit(); @@ -10308,8 +10308,7 @@ OMPClause *Sema::ActOnOpenMPCopyprivateClause(ArrayRef VarList, auto *DstVD = buildVarDecl(*this, RefExpr->getLocStart(), Type, ".copyprivate.dst", D->hasAttrs() ? &D->getAttrs() : nullptr); - auto *PseudoDstExpr = - buildDeclRefExpr(*this, DstVD, Type, ELoc); + auto *PseudoDstExpr = buildDeclRefExpr(*this, DstVD, Type, ELoc); auto AssignmentOp = BuildBinOp(DSAStack->getCurScope(), ELoc, BO_Assign, PseudoDstExpr, PseudoSrcExpr); if (AssignmentOp.isInvalid()) @@ -10570,8 +10569,7 @@ static bool CheckTypeMappable(SourceLocation SL, SourceRange SR, Sema &SemaRef, SemaRef.Diag(SL, diag::err_incomplete_type) << QTy << SR; return false; } else if (CXXRecordDecl *RD = dyn_cast_or_null(ND)) { - if (!RD->isInvalidDecl() && - !IsCXXRecordForMappable(SemaRef, SL, Stack, RD)) + if (!RD->isInvalidDecl() && !IsCXXRecordForMappable(SemaRef, SL, Stack, RD)) return false; } return true; @@ -10600,7 +10598,7 @@ static bool CheckArrayExpressionDoesNotReferToWholeSize(Sema &SemaRef, auto *Length = OASE->getLength(); // If there is a lower bound that does not evaluates to zero, we are not - // convering the whole dimension. + // covering the whole dimension. if (LowerBound) { llvm::APSInt ConstLowerBound; if (!LowerBound->EvaluateAsInt(ConstLowerBound, SemaRef.getASTContext())) @@ -10635,8 +10633,8 @@ static bool CheckArrayExpressionDoesNotReferToWholeSize(Sema &SemaRef, // section or array subscript) does NOT specify a single element of the array // whose base type is \a BaseQTy. static bool CheckArrayExpressionDoesNotReferToUnitySize(Sema &SemaRef, - const Expr *E, - QualType BaseQTy) { + const Expr *E, + QualType BaseQTy) { auto *OASE = dyn_cast(E); // An array subscript always refer to a single element. Also, an array section @@ -10955,10 +10953,10 @@ static bool CheckMapConflicts( for (; SI != SE; ++SI) { QualType Type; if (auto *ASE = - dyn_cast(SI->getAssociatedExpression())) { + dyn_cast(SI->getAssociatedExpression())) { Type = ASE->getBase()->IgnoreParenImpCasts()->getType(); - } else if (auto *OASE = - dyn_cast(SI->getAssociatedExpression())) { + } else if (auto *OASE = dyn_cast( + SI->getAssociatedExpression())) { auto *E = OASE->getBase()->IgnoreParenImpCasts(); Type = OMPArraySectionExpr::getBaseOriginalType(E).getCanonicalType(); @@ -11545,7 +11543,7 @@ Sema::DeclGroupPtrTy Sema::ActOnOpenMPDeclareReductionDirectiveEnd( return DeclReductions; } -OMPClause *Sema::ActOnOpenMPNumTeamsClause(Expr *NumTeams, +OMPClause *Sema::ActOnOpenMPNumTeamsClause(Expr *NumTeams, SourceLocation StartLoc, SourceLocation LParenLoc, SourceLocation EndLoc) { @@ -11572,8 +11570,8 @@ OMPClause *Sema::ActOnOpenMPThreadLimitClause(Expr *ThreadLimit, /*StrictlyPositive=*/true)) return nullptr; - return new (Context) OMPThreadLimitClause(ValExpr, StartLoc, LParenLoc, - EndLoc); + return new (Context) + OMPThreadLimitClause(ValExpr, StartLoc, LParenLoc, EndLoc); } OMPClause *Sema::ActOnOpenMPPriorityClause(Expr *Priority, @@ -11692,18 +11690,17 @@ OMPClause *Sema::ActOnOpenMPDefaultmapClause( SourceLocation StartLoc, SourceLocation LParenLoc, SourceLocation MLoc, SourceLocation KindLoc, SourceLocation EndLoc) { // OpenMP 4.5 only supports 'defaultmap(tofrom: scalar)' - if (M != OMPC_DEFAULTMAP_MODIFIER_tofrom || - Kind != OMPC_DEFAULTMAP_scalar) { + if (M != OMPC_DEFAULTMAP_MODIFIER_tofrom || Kind != OMPC_DEFAULTMAP_scalar) { std::string Value; SourceLocation Loc; Value += "'"; if (M != OMPC_DEFAULTMAP_MODIFIER_tofrom) { Value += getOpenMPSimpleClauseTypeName(OMPC_defaultmap, - OMPC_DEFAULTMAP_MODIFIER_tofrom); + OMPC_DEFAULTMAP_MODIFIER_tofrom); Loc = MLoc; } else { Value += getOpenMPSimpleClauseTypeName(OMPC_defaultmap, - OMPC_DEFAULTMAP_scalar); + OMPC_DEFAULTMAP_scalar); Loc = KindLoc; } Value += "'"; @@ -11740,11 +11737,11 @@ void Sema::ActOnFinishOpenMPDeclareTargetDirective() { IsInOpenMPDeclareTargetContext = false; } -void -Sema::ActOnOpenMPDeclareTargetName(Scope *CurScope, CXXScopeSpec &ScopeSpec, - const DeclarationNameInfo &Id, - OMPDeclareTargetDeclAttr::MapTypeTy MT, - NamedDeclSetType &SameDirectiveDecls) { +void Sema::ActOnOpenMPDeclareTargetName(Scope *CurScope, + CXXScopeSpec &ScopeSpec, + const DeclarationNameInfo &Id, + OMPDeclareTargetDeclAttr::MapTypeTy MT, + NamedDeclSetType &SameDirectiveDecls) { LookupResult Lookup(*this, Id, LookupOrdinaryName); LookupParsedName(Lookup, CurScope, &ScopeSpec, true); @@ -12065,7 +12062,7 @@ OMPClause *Sema::ActOnOpenMPIsDevicePtrClause(ArrayRef VarList, Expr *ConflictExpr; if (DSAStack->checkMappableExprComponentListsForDecl( - D, /* CurrentRegionOnly = */ true, + D, /*CurrentRegionOnly=*/true, [&ConflictExpr]( OMPClauseMappableExprCommon::MappableExprComponentListRef R, OpenMPClauseKind) -> bool { -- 2.34.1