Author: Krzysztof Parzyszek Date: 2024-08-18T10:48:49-05:00 New Revision: de5ea2d122c31e1551654ff506c33df299f351b8
URL: https://github.com/llvm/llvm-project/commit/de5ea2d122c31e1551654ff506c33df299f351b8 DIFF: https://github.com/llvm/llvm-project/commit/de5ea2d122c31e1551654ff506c33df299f351b8.diff LOG: [clang][OpenMP] Change /* ParamName */ to /*ParamName=*/, NFC Change foo(/* Index */ 0); to foo(/*Index=*/0); There was a mix of these two formats in the source. Clang-format treats the latter one a bit better, so use that one consistently. Added: Modified: clang/lib/Sema/SemaOpenMP.cpp Removed: ################################################################################ diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp index ac51bee29bc5b0..5950bc272fae3c 100644 --- a/clang/lib/Sema/SemaOpenMP.cpp +++ b/clang/lib/Sema/SemaOpenMP.cpp @@ -4021,7 +4021,7 @@ class DSAAttrChecker final : public StmtVisitor<DSAAttrChecker, void> { OpenMPDefaultmapClauseKind ClauseKind = getVariableCategoryFromDecl(SemaRef.getLangOpts(), FD); OpenMPMapClauseKind Kind = getMapClauseKindFromModifier( - Modifier, /*IsAggregateOrDeclareTarget*/ true); + Modifier, /*IsAggregateOrDeclareTarget=*/true); ImplicitMap[ClauseKind][Kind].emplace_back(E); return; } @@ -4586,7 +4586,7 @@ static bool checkOrderedOrderSpecified(Sema &S, StmtResult SemaOpenMP::ActOnOpenMPRegionEnd(StmtResult S, ArrayRef<OMPClause *> Clauses) { handleDeclareVariantConstructTrait(DSAStack, DSAStack->getCurrentDirective(), - /* ScopeEntry */ false); + /*ScopeEntry=*/false); if (!isOpenMPCapturingDirective(DSAStack->getCurrentDirective())) return S; @@ -7057,8 +7057,8 @@ void SemaOpenMP::ActOnStartOfFunctionDefinitionInOpenMPDeclareVariantScope( QualType UDeclTy = UDecl->getType(); if (!UDeclTy->isDependentType()) { QualType NewType = getASTContext().mergeFunctionTypes( - FType, UDeclTy, /* OfBlockPointer */ false, - /* Unqualified */ false, /* AllowCXX */ true); + FType, UDeclTy, /*OfBlockPointer=*/false, + /*Unqualified=*/false, /*AllowCXX=*/true); if (NewType.isNull()) continue; } @@ -7104,9 +7104,8 @@ void SemaOpenMP::ActOnFinishedFunctionDefinitionInOpenMPDeclareVariantScope( FD = cast<FunctionDecl>(D); auto *VariantFuncRef = DeclRefExpr::Create( getASTContext(), NestedNameSpecifierLoc(), SourceLocation(), FD, - /* RefersToEnclosingVariableOrCapture */ false, - /* NameLoc */ FD->getLocation(), FD->getType(), - ExprValueKind::VK_PRValue); + /*RefersToEnclosingVariableOrCapture=*/false, + /*NameLoc=*/FD->getLocation(), FD->getType(), ExprValueKind::VK_PRValue); OMPDeclareVariantScope &DVScope = OMPDeclareVariantScopes.back(); auto *OMPDeclareVariantA = OMPDeclareVariantAttr::CreateImplicit( @@ -7168,7 +7167,7 @@ ExprResult SemaOpenMP::ActOnOpenMPCall(ExprResult Call, Scope *Scope, OMPTraitInfo &TI = A->getTraitInfo(); TI.getAsVariantMatchInfo(Context, VMI); if (!isVariantApplicableInContext(VMI, OMPCtx, - /* DeviceSetOnly */ false)) + /*DeviceSetOnly=*/false)) continue; VMIs.push_back(VMI); @@ -7204,7 +7203,7 @@ ExprResult SemaOpenMP::ActOnOpenMPCall(ExprResult Call, Scope *Scope, auto *MemberCall = dyn_cast<CXXMemberCallExpr>(CE); BestExpr = MemberExpr::CreateImplicit( Context, MemberCall->getImplicitObjectArgument(), - /* IsArrow */ false, SpecializedMethod, Context.BoundMemberTy, + /*IsArrow=*/false, SpecializedMethod, Context.BoundMemberTy, MemberCall->getValueKind(), MemberCall->getObjectKind()); } NewCall = SemaRef.BuildCallExpr(Scope, BestExpr, LParenLoc, ArgExprs, @@ -7214,8 +7213,8 @@ ExprResult SemaOpenMP::ActOnOpenMPCall(ExprResult Call, Scope *Scope, FunctionDecl *NewCalleeFnDecl = NCE->getDirectCallee(); QualType NewType = getASTContext().mergeFunctionTypes( CalleeFnType, NewCalleeFnDecl->getType(), - /* OfBlockPointer */ false, - /* Unqualified */ false, /* AllowCXX */ true); + /*OfBlockPointer=*/false, + /*Unqualified=*/false, /*AllowCXX=*/true); if (!NewType.isNull()) break; // Don't use the call if the function type was not compatible. @@ -9413,7 +9412,7 @@ static ExprResult widenIterationCount(unsigned Bits, Expr *E, Sema &SemaRef) { if (HasBits >= Bits) return ExprResult(E); // OK to convert to signed, because new type has more bits than old. - QualType NewType = C.getIntTypeForBitwidth(Bits, /* Signed */ true); + QualType NewType = C.getIntTypeForBitwidth(Bits, /*Signed=*/true); return SemaRef.PerformImplicitConversion(E, NewType, Sema::AA_Converting, true); } @@ -9598,7 +9597,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, })) return 0; - Built.clear(/* size */ NestedLoopCount); + Built.clear(/*size=*/NestedLoopCount); if (SemaRef.CurContext->isDependentContext()) return NestedLoopCount; @@ -9752,13 +9751,13 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, LB = buildDeclRefExpr(SemaRef, LBDecl, VType, InitLoc); SemaRef.AddInitializerToDecl(LBDecl, SemaRef.ActOnIntegerConstant(InitLoc, 0).get(), - /*DirectInit*/ false); + /*DirectInit=*/false); // Upper bound variable, initialized with last iteration number. VarDecl *UBDecl = buildVarDecl(SemaRef, InitLoc, VType, ".omp.ub"); UB = buildDeclRefExpr(SemaRef, UBDecl, VType, InitLoc); SemaRef.AddInitializerToDecl(UBDecl, LastIteration.get(), - /*DirectInit*/ false); + /*DirectInit=*/false); // A 32-bit variable-flag where runtime returns 1 for the last iteration. // This will be used to implement clause 'lastprivate'. @@ -9767,7 +9766,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, IL = buildDeclRefExpr(SemaRef, ILDecl, Int32Ty, InitLoc); SemaRef.AddInitializerToDecl(ILDecl, SemaRef.ActOnIntegerConstant(InitLoc, 0).get(), - /*DirectInit*/ false); + /*DirectInit=*/false); // Stride variable returned by runtime (we initialize it to 1 by default). VarDecl *STDecl = @@ -9775,7 +9774,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, ST = buildDeclRefExpr(SemaRef, STDecl, StrideVType, InitLoc); SemaRef.AddInitializerToDecl(STDecl, SemaRef.ActOnIntegerConstant(InitLoc, 1).get(), - /*DirectInit*/ false); + /*DirectInit=*/false); // Build expression: UB = min(UB, LastIteration) // It is necessary for CodeGen of directives with static scheduling. @@ -9786,7 +9785,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, LastIteration.get(), UB.get()); EUB = SemaRef.BuildBinOp(CurScope, InitLoc, BO_Assign, UB.get(), CondOp.get()); - EUB = SemaRef.ActOnFinishFullExpr(EUB.get(), /*DiscardedValue*/ false); + EUB = SemaRef.ActOnFinishFullExpr(EUB.get(), /*DiscardedValue=*/false); // If we have a combined directive that combines 'distribute', 'for' or // 'simd' we need to be able to access the bounds of the schedule of the @@ -9799,14 +9798,14 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, CombLB = buildDeclRefExpr(SemaRef, CombLBDecl, VType, InitLoc); SemaRef.AddInitializerToDecl( CombLBDecl, SemaRef.ActOnIntegerConstant(InitLoc, 0).get(), - /*DirectInit*/ false); + /*DirectInit=*/false); // Upper bound variable, initialized with last iteration number. VarDecl *CombUBDecl = buildVarDecl(SemaRef, InitLoc, VType, ".omp.comb.ub"); CombUB = buildDeclRefExpr(SemaRef, CombUBDecl, VType, InitLoc); SemaRef.AddInitializerToDecl(CombUBDecl, LastIteration.get(), - /*DirectInit*/ false); + /*DirectInit=*/false); ExprResult CombIsUBGreater = SemaRef.BuildBinOp( CurScope, InitLoc, BO_GT, CombUB.get(), LastIteration.get()); @@ -9816,7 +9815,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, CombEUB = SemaRef.BuildBinOp(CurScope, InitLoc, BO_Assign, CombUB.get(), CombCondOp.get()); CombEUB = - SemaRef.ActOnFinishFullExpr(CombEUB.get(), /*DiscardedValue*/ false); + SemaRef.ActOnFinishFullExpr(CombEUB.get(), /*DiscardedValue=*/false); const CapturedDecl *CD = cast<CapturedStmt>(AStmt)->getCapturedDecl(); // We expect to have at least 2 more parameters than the 'parallel' @@ -9852,7 +9851,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, ? LB.get() : SemaRef.ActOnIntegerConstant(SourceLocation(), 0).get(); Init = SemaRef.BuildBinOp(CurScope, InitLoc, BO_Assign, IV.get(), RHS); - Init = SemaRef.ActOnFinishFullExpr(Init.get(), /*DiscardedValue*/ false); + Init = SemaRef.ActOnFinishFullExpr(Init.get(), /*DiscardedValue=*/false); if (isOpenMPLoopBoundSharingDirective(DKind)) { Expr *CombRHS = @@ -9865,7 +9864,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, CombInit = SemaRef.BuildBinOp(CurScope, InitLoc, BO_Assign, IV.get(), CombRHS); CombInit = - SemaRef.ActOnFinishFullExpr(CombInit.get(), /*DiscardedValue*/ false); + SemaRef.ActOnFinishFullExpr(CombInit.get(), /*DiscardedValue=*/false); } } @@ -9885,7 +9884,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, SemaRef.ActOnIntegerConstant(SourceLocation(), 1).get()) .get(); BoundUB = - SemaRef.ActOnFinishFullExpr(BoundUB, /*DiscardedValue*/ false).get(); + SemaRef.ActOnFinishFullExpr(BoundUB, /*DiscardedValue=*/false).get(); } ExprResult Cond = (isOpenMPWorksharingDirective(DKind) || @@ -9914,7 +9913,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, SemaRef.ActOnIntegerConstant(SourceLocation(), 1).get()) .get(); BoundCombUB = - SemaRef.ActOnFinishFullExpr(BoundCombUB, /*DiscardedValue*/ false) + SemaRef.ActOnFinishFullExpr(BoundCombUB, /*DiscardedValue=*/false) .get(); } CombCond = @@ -9929,7 +9928,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, if (!Inc.isUsable()) return 0; Inc = SemaRef.BuildBinOp(CurScope, IncLoc, BO_Assign, IV.get(), Inc.get()); - Inc = SemaRef.ActOnFinishFullExpr(Inc.get(), /*DiscardedValue*/ false); + Inc = SemaRef.ActOnFinishFullExpr(Inc.get(), /*DiscardedValue=*/false); if (!Inc.isUsable()) return 0; @@ -9950,7 +9949,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, NextLB = SemaRef.BuildBinOp(CurScope, IncLoc, BO_Assign, LB.get(), NextLB.get()); NextLB = - SemaRef.ActOnFinishFullExpr(NextLB.get(), /*DiscardedValue*/ false); + SemaRef.ActOnFinishFullExpr(NextLB.get(), /*DiscardedValue=*/false); if (!NextLB.isUsable()) return 0; // UB + ST @@ -9961,7 +9960,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, NextUB = SemaRef.BuildBinOp(CurScope, IncLoc, BO_Assign, UB.get(), NextUB.get()); NextUB = - SemaRef.ActOnFinishFullExpr(NextUB.get(), /*DiscardedValue*/ false); + SemaRef.ActOnFinishFullExpr(NextUB.get(), /*DiscardedValue=*/false); if (!NextUB.isUsable()) return 0; if (isOpenMPLoopBoundSharingDirective(DKind)) { @@ -9973,7 +9972,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, CombNextLB = SemaRef.BuildBinOp(CurScope, IncLoc, BO_Assign, CombLB.get(), CombNextLB.get()); CombNextLB = SemaRef.ActOnFinishFullExpr(CombNextLB.get(), - /*DiscardedValue*/ false); + /*DiscardedValue=*/false); if (!CombNextLB.isUsable()) return 0; // UB + ST @@ -9985,7 +9984,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, CombNextUB = SemaRef.BuildBinOp(CurScope, IncLoc, BO_Assign, CombUB.get(), CombNextUB.get()); CombNextUB = SemaRef.ActOnFinishFullExpr(CombNextUB.get(), - /*DiscardedValue*/ false); + /*DiscardedValue=*/false); if (!CombNextUB.isUsable()) return 0; } @@ -10008,7 +10007,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, DistInc = SemaRef.BuildBinOp(CurScope, DistIncLoc, BO_Assign, IV.get(), DistInc.get()); DistInc = - SemaRef.ActOnFinishFullExpr(DistInc.get(), /*DiscardedValue*/ false); + SemaRef.ActOnFinishFullExpr(DistInc.get(), /*DiscardedValue=*/false); assert(DistInc.isUsable() && "distribute inc expr was not built"); // Build expression: UB = min(UB, prevUB) for #for in composite or combined @@ -10031,7 +10030,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, PrevEUB = SemaRef.BuildBinOp(CurScope, DistIncLoc, BO_Assign, UB.get(), CondOp.get()); PrevEUB = - SemaRef.ActOnFinishFullExpr(PrevEUB.get(), /*DiscardedValue*/ false); + SemaRef.ActOnFinishFullExpr(PrevEUB.get(), /*DiscardedValue=*/false); // Build IV <= PrevUB or IV < PrevUB + 1 for unsigned IV to be used in // parallel for is in combination with a distribute directive with @@ -10045,7 +10044,7 @@ checkOpenMPLoop(OpenMPDirectiveKind DKind, Expr *CollapseLoopCountExpr, SemaRef.ActOnIntegerConstant(SourceLocation(), 1).get()) .get(); BoundPrevUB = - SemaRef.ActOnFinishFullExpr(BoundPrevUB, /*DiscardedValue*/ false) + SemaRef.ActOnFinishFullExpr(BoundPrevUB, /*DiscardedValue=*/false) .get(); } ParForInDistCond = @@ -15317,7 +15316,7 @@ SemaOpenMP::PerformOpenMPImplicitIntegerConversion(SourceLocation Loc, class IntConvertDiagnoser : public Sema::ICEConvertDiagnoser { public: IntConvertDiagnoser() - : ICEConvertDiagnoser(/*AllowScopedEnumerations*/ false, false, true) {} + : ICEConvertDiagnoser(/*AllowScopedEnumerations=*/false, false, true) {} SemaDiagnosticBuilder diagnoseNotInt(Sema &S, SourceLocation Loc, QualType T) override { return S.Diag(Loc, diag::err_omp_not_integral) << T; @@ -15540,7 +15539,7 @@ static bool findOMPAllocatorHandleT(Sema &S, SourceLocation Loc, } Res = S.PerformImplicitConversion(Res.get(), AllocatorHandleEnumTy, Sema::AA_Initializing, - /* AllowExplicit */ true); + /*AllowExplicit=*/true); if (!Res.isUsable()) { ErrorFound = true; break; @@ -17643,7 +17642,7 @@ OMPClause *SemaOpenMP::ActOnOpenMPLastprivateClause( if (AssignmentOp.isInvalid()) continue; AssignmentOp = SemaRef.ActOnFinishFullExpr(AssignmentOp.get(), ELoc, - /*DiscardedValue*/ false); + /*DiscardedValue=*/false); if (AssignmentOp.isInvalid()) continue; @@ -18360,7 +18359,7 @@ static bool actOnOMPReductionKindClause( // A list item that appears in a reduction clause must not be // const-qualified. if (rejectConstNotMutableType(S, D, Type, ClauseKind, ELoc, - /*AcceptIfMutable*/ false, ASE || OASE)) + /*AcceptIfMutable=*/false, ASE || OASE)) continue; OpenMPDirectiveKind CurrDir = Stack->getCurrentDirective(); @@ -18753,7 +18752,7 @@ static bool actOnOMPReductionKindClause( } if (ReductionOp.isUsable()) ReductionOp = S.ActOnFinishFullExpr(ReductionOp.get(), - /*DiscardedValue*/ false); + /*DiscardedValue=*/false); if (!ReductionOp.isUsable()) continue; } @@ -19172,7 +19171,7 @@ OMPClause *SemaOpenMP::ActOnOpenMPLinearClause( ExprResult CalcStep = SemaRef.BuildBinOp( SemaRef.getCurScope(), StepLoc, BO_Assign, SaveRef.get(), StepExpr); CalcStep = - SemaRef.ActOnFinishFullExpr(CalcStep.get(), /*DiscardedValue*/ false); + SemaRef.ActOnFinishFullExpr(CalcStep.get(), /*DiscardedValue=*/false); // Warn about zero linear step (it would be probably better specified as // making corresponding variables 'const'). @@ -19261,7 +19260,7 @@ static bool FinishOpenMPLinearClause(OMPLinearClause &Clause, DeclRefExpr *IV, else Update = *CurPrivate; Update = SemaRef.ActOnFinishFullExpr(Update.get(), DE->getBeginLoc(), - /*DiscardedValue*/ false); + /*DiscardedValue=*/false); // Build final: Var = PrivCopy; ExprResult Final; @@ -19272,7 +19271,7 @@ static bool FinishOpenMPLinearClause(OMPLinearClause &Clause, DeclRefExpr *IV, else Final = *CurPrivate; Final = SemaRef.ActOnFinishFullExpr(Final.get(), DE->getBeginLoc(), - /*DiscardedValue*/ false); + /*DiscardedValue=*/false); if (!Update.isUsable() || !Final.isUsable()) { Updates.push_back(nullptr); @@ -19451,7 +19450,7 @@ OMPClause *SemaOpenMP::ActOnOpenMPCopyinClause(ArrayRef<Expr *> VarList, continue; AssignmentOp = SemaRef.ActOnFinishFullExpr(AssignmentOp.get(), DE->getExprLoc(), - /*DiscardedValue*/ false); + /*DiscardedValue=*/false); if (AssignmentOp.isInvalid()) continue; @@ -19560,7 +19559,7 @@ OMPClause *SemaOpenMP::ActOnOpenMPCopyprivateClause(ArrayRef<Expr *> VarList, if (AssignmentOp.isInvalid()) continue; AssignmentOp = SemaRef.ActOnFinishFullExpr(AssignmentOp.get(), ELoc, - /*DiscardedValue*/ false); + /*DiscardedValue=*/false); if (AssignmentOp.isInvalid()) continue; @@ -20946,7 +20945,7 @@ static ExprResult buildImplicitMapper(Sema &S, QualType BaseType, BaseType, MapperId, Maps, nullptr); Scope *Scope = S.getScopeForContext(DCT); if (Scope) - S.PushOnScopeChains(DMD, Scope, /*AddToContext*/ false); + S.PushOnScopeChains(DMD, Scope, /*AddToContext=*/false); DCT->addDecl(DMD); DMD->setAccess(clang::AS_none); auto *VD = cast<DeclRefExpr>(MapperVarRef)->getDecl(); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
