================
@@ -7366,17 +7366,50 @@ static void emitCommonOMPTeamsDirective(CodeGenFunction
&CGF,
CGF, S, *CS->getCapturedDecl()->param_begin(), InnermostKind,
CodeGen);
- const auto *NT = S.getSingleClause<OMPNumTeamsClause>();
- const auto *TL = S.getSingleClause<OMPThreadLimitClause>();
- if (NT || TL) {
- const Expr *NumTeams = NT ? NT->getNumTeams().front() : nullptr;
- const Expr *ThreadLimit = TL ? TL->getThreadLimit().front() : nullptr;
+ OMPTeamsScope Scope(CGF, S);
+ auto &&ParallelLeague = [&S](CodeGenFunction &CGF, PrePostActionTy &) {
+ const auto *NT = S.getSingleClause<OMPNumTeamsClause>();
+ const auto *TL = S.getSingleClause<OMPThreadLimitClause>();
+ if (NT || TL) {
+ const Expr *NumTeams = NT ? NT->getNumTeams().front() : nullptr;
+ const Expr *ThreadLimit = TL ? TL->getThreadLimit().front() : nullptr;
+
+ CGF.CGM.getOpenMPRuntime().emitNumTeamsClause(CGF, NumTeams, ThreadLimit,
+ S.getBeginLoc());
+ }
+ };
- CGF.CGM.getOpenMPRuntime().emitNumTeamsClause(CGF, NumTeams, ThreadLimit,
- S.getBeginLoc());
+ const Expr *IfCond = nullptr;
+ for (const auto *C : S.getClausesOfKind<OMPIfClause>()) {
+ if (C->getNameModifier() == OMPD_unknown ||
+ C->getNameModifier() == OMPD_teams) {
+ IfCond = C->getCondition();
+ break;
+ }
+ }
+ if (IfCond && CGF.CGM.getLangOpts().OpenMP > 51) {
----------------
Thyre wrote:
Since the `if` clause for the `teams` construct is allowed with OpenMP v5.2 and
newer, I replaced this with `>= 52`.
I also updated the comment just below that line to reference the OpenMP v5.2
spec. instead of OpenMP 6.0. Implemented in
c110eb12d50d113b8bf98f0946d8c8b44f5aecc6.
https://github.com/llvm/llvm-project/pull/207444
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
