[flang-commits] [flang] [flang][OpenMP] Resolve all components of OmpDirectiveSpecification (PR #159946)
Krzysztof Parzyszek via flang-commits
flang-commits at lists.llvm.org
Tue Sep 23 06:11:59 PDT 2025
https://github.com/kparzysz updated https://github.com/llvm/llvm-project/pull/159946
>From d7303ba83c92abbd6e8b849dbed8239345054269 Mon Sep 17 00:00:00 2001
From: Krzysztof Parzyszek <Krzysztof.Parzyszek at amd.com>
Date: Fri, 19 Sep 2025 13:15:30 -0500
Subject: [PATCH 1/5] [flang][OpenMP] Simplify handling of UserReductionDetails
a bit
Instead of having a variant with specific AST nodes that can contain
a reduction specifier, simply store the OpenMPDeclarativeConstruct.
It is used to emit the source code directive when generating a module
file, and unparsing the top-level AST node will work just fine.
---
flang/include/flang/Semantics/symbol.h | 11 +++++------
flang/lib/Parser/unparse.cpp | 7 ++-----
flang/lib/Semantics/mod-file.cpp | 15 ++-------------
flang/lib/Semantics/resolve-names.cpp | 20 +++++++++-----------
4 files changed, 18 insertions(+), 35 deletions(-)
diff --git a/flang/include/flang/Semantics/symbol.h b/flang/include/flang/Semantics/symbol.h
index 774fc9873f7bc..e90e9c617805d 100644
--- a/flang/include/flang/Semantics/symbol.h
+++ b/flang/include/flang/Semantics/symbol.h
@@ -30,8 +30,7 @@ class raw_ostream;
}
namespace Fortran::parser {
struct Expr;
-struct OpenMPDeclareReductionConstruct;
-struct OmpMetadirectiveDirective;
+struct OpenMPDeclarativeConstruct;
}
namespace Fortran::semantics {
@@ -736,9 +735,7 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &, const GenericDetails &);
class UserReductionDetails {
public:
using TypeVector = std::vector<const DeclTypeSpec *>;
- using DeclInfo = std::variant<const parser::OpenMPDeclareReductionConstruct *,
- const parser::OmpMetadirectiveDirective *>;
- using DeclVector = std::vector<DeclInfo>;
+ using DeclVector = std::vector<const parser::OpenMPDeclarativeConstruct *>;
UserReductionDetails() = default;
@@ -756,7 +753,9 @@ class UserReductionDetails {
return false;
}
- void AddDecl(const DeclInfo &decl) { declList_.emplace_back(decl); }
+ void AddDecl(const parser::OpenMPDeclarativeConstruct *decl) {
+ declList_.emplace_back(decl);
+ }
const DeclVector &GetDeclList() const { return declList_; }
private:
diff --git a/flang/lib/Parser/unparse.cpp b/flang/lib/Parser/unparse.cpp
index 9d73bcafa0e15..2db60c9a78b0f 100644
--- a/flang/lib/Parser/unparse.cpp
+++ b/flang/lib/Parser/unparse.cpp
@@ -3082,11 +3082,8 @@ template void Unparse<Expr>(llvm::raw_ostream &, const Expr &,
const common::LangOptions &, Encoding, bool, bool, preStatementType *,
AnalyzedObjectsAsFortran *);
-template void Unparse<parser::OpenMPDeclareReductionConstruct>(
- llvm::raw_ostream &, const parser::OpenMPDeclareReductionConstruct &,
+template void Unparse<parser::OpenMPDeclarativeConstruct>(
+ llvm::raw_ostream &, const parser::OpenMPDeclarativeConstruct &,
const common::LangOptions &, Encoding, bool, bool, preStatementType *,
AnalyzedObjectsAsFortran *);
-template void Unparse<parser::OmpMetadirectiveDirective>(llvm::raw_ostream &,
- const parser::OmpMetadirectiveDirective &, const common::LangOptions &,
- Encoding, bool, bool, preStatementType *, AnalyzedObjectsAsFortran *);
} // namespace Fortran::parser
diff --git a/flang/lib/Semantics/mod-file.cpp b/flang/lib/Semantics/mod-file.cpp
index 82c8536902eb2..8074c94b41e1a 100644
--- a/flang/lib/Semantics/mod-file.cpp
+++ b/flang/lib/Semantics/mod-file.cpp
@@ -1056,19 +1056,8 @@ void ModFileWriter::PutUserReduction(
// The module content for a OpenMP Declare Reduction is the OpenMP
// declaration. There may be multiple declarations.
// Decls are pointers, so do not use a reference.
- for (const auto decl : details.GetDeclList()) {
- common::visit( //
- common::visitors{//
- [&](const parser::OpenMPDeclareReductionConstruct *d) {
- Unparse(os, *d, context_.langOptions());
- },
- [&](const parser::OmpMetadirectiveDirective *m) {
- Unparse(os, *m, context_.langOptions());
- },
- [&](const auto &) {
- DIE("Unknown OpenMP DECLARE REDUCTION content");
- }},
- decl);
+ for (const auto *decl : details.GetDeclList()) {
+ Unparse(os, *decl, context_.langOptions());
}
}
diff --git a/flang/lib/Semantics/resolve-names.cpp b/flang/lib/Semantics/resolve-names.cpp
index cdd8d6ff2f60e..69b8a45e6ceaa 100644
--- a/flang/lib/Semantics/resolve-names.cpp
+++ b/flang/lib/Semantics/resolve-names.cpp
@@ -1480,12 +1480,10 @@ class OmpVisitor : public virtual DeclarationVisitor {
static bool NeedsScope(const parser::OmpClause &);
bool Pre(const parser::OmpMetadirectiveDirective &x) { //
- metaDirective_ = &x;
++metaLevel_;
return true;
}
void Post(const parser::OmpMetadirectiveDirective &) { //
- metaDirective_ = nullptr;
--metaLevel_;
}
@@ -1583,7 +1581,8 @@ class OmpVisitor : public virtual DeclarationVisitor {
AddOmpSourceRange(x.source);
ProcessReductionSpecifier(
std::get<Indirection<parser::OmpReductionSpecifier>>(x.t).value(),
- std::get<std::optional<parser::OmpClauseList>>(x.t), x);
+ std::get<std::optional<parser::OmpClauseList>>(x.t),
+ declaratives_.back());
return false;
}
bool Pre(const parser::OmpMapClause &);
@@ -1684,9 +1683,11 @@ class OmpVisitor : public virtual DeclarationVisitor {
// can implicitly declare variables instead of only using the
// ones already declared in the Fortran sources.
SkipImplicitTyping(true);
+ declaratives_.push_back(&x);
return true;
}
void Post(const parser::OpenMPDeclarativeConstruct &) {
+ declaratives_.pop_back();
SkipImplicitTyping(false);
messageHandler().set_currStmtSource(std::nullopt);
}
@@ -1728,15 +1729,14 @@ class OmpVisitor : public virtual DeclarationVisitor {
private:
void ProcessMapperSpecifier(const parser::OmpMapperSpecifier &spec,
const parser::OmpClauseList &clauses);
- template <typename T>
void ProcessReductionSpecifier(const parser::OmpReductionSpecifier &spec,
const std::optional<parser::OmpClauseList> &clauses,
- const T &wholeConstruct);
+ const parser::OpenMPDeclarativeConstruct *wholeConstruct);
void ResolveCriticalName(const parser::OmpArgument &arg);
int metaLevel_{0};
- const parser::OmpMetadirectiveDirective *metaDirective_{nullptr};
+ std::vector<const parser::OpenMPDeclarativeConstruct *> declaratives_;
};
bool OmpVisitor::NeedsScope(const parser::OmpBlockConstruct &x) {
@@ -1861,11 +1861,10 @@ std::string MangleDefinedOperator(const parser::CharBlock &name) {
return "op" + name.ToString();
}
-template <typename T>
void OmpVisitor::ProcessReductionSpecifier(
const parser::OmpReductionSpecifier &spec,
const std::optional<parser::OmpClauseList> &clauses,
- const T &wholeOmpConstruct) {
+ const parser::OpenMPDeclarativeConstruct *construct) {
const parser::Name *name{nullptr};
parser::CharBlock mangledName;
UserReductionDetails reductionDetailsTemp;
@@ -1952,7 +1951,7 @@ void OmpVisitor::ProcessReductionSpecifier(
PopScope();
}
- reductionDetails->AddDecl(&wholeOmpConstruct);
+ reductionDetails->AddDecl(construct);
if (!symbol) {
symbol = &MakeSymbol(mangledName, Attrs{}, std::move(*reductionDetails));
@@ -2017,8 +2016,7 @@ bool OmpVisitor::Pre(const parser::OmpDirectiveSpecification &x) {
if (maybeArgs && maybeClauses) {
const parser::OmpArgument &first{maybeArgs->v.front()};
if (auto *spec{std::get_if<parser::OmpReductionSpecifier>(&first.u)}) {
- CHECK(metaDirective_);
- ProcessReductionSpecifier(*spec, maybeClauses, *metaDirective_);
+ ProcessReductionSpecifier(*spec, maybeClauses, declaratives_.back());
}
}
break;
>From 0fa862b9382c8e5b774bf103c7c3c7fb04bc6268 Mon Sep 17 00:00:00 2001
From: Krzysztof Parzyszek <Krzysztof.Parzyszek at amd.com>
Date: Sat, 20 Sep 2025 12:11:18 -0500
Subject: [PATCH 2/5] [flang][OpenMP] Stop tracking metadirective level in name
resolution
This was checked in the visitor for OmpDirectiveSpecification, and is
not necessary anymore: the early exit (in case of not being inside of
a METADIRECTIVE) performs the same actions as the code that was skipped,
except it does so through a different sequence of function calls. The
net result ends up being the same in either case.
The processing of the mapper and reduction specifiers inside of
OmpDirectiveSpecification is necesary for the declare directives on
WHEN/OTHERWISE clauses, so it's the early exit that needs to be removed.
In fact, when the DECLARE_MAPPER/REDUCTION use OmpDirectiveSpecification,
this processing will automatically take over the handling of the contained
specifiers.
---
flang/lib/Semantics/resolve-names.cpp | 46 +++++++++------------------
1 file changed, 15 insertions(+), 31 deletions(-)
diff --git a/flang/lib/Semantics/resolve-names.cpp b/flang/lib/Semantics/resolve-names.cpp
index 69b8a45e6ceaa..13edb118a3286 100644
--- a/flang/lib/Semantics/resolve-names.cpp
+++ b/flang/lib/Semantics/resolve-names.cpp
@@ -1479,14 +1479,6 @@ class OmpVisitor : public virtual DeclarationVisitor {
static bool NeedsScope(const parser::OmpBlockConstruct &);
static bool NeedsScope(const parser::OmpClause &);
- bool Pre(const parser::OmpMetadirectiveDirective &x) { //
- ++metaLevel_;
- return true;
- }
- void Post(const parser::OmpMetadirectiveDirective &) { //
- --metaLevel_;
- }
-
bool Pre(const parser::OpenMPRequiresConstruct &x) {
AddOmpSourceRange(x.source);
return true;
@@ -1579,10 +1571,11 @@ class OmpVisitor : public virtual DeclarationVisitor {
bool Pre(const parser::OpenMPDeclareReductionConstruct &x) {
AddOmpSourceRange(x.source);
+ parser::OmpClauseList empty(std::list<parser::OmpClause>{});
+ auto &maybeClauses{std::get<std::optional<parser::OmpClauseList>>(x.t)};
ProcessReductionSpecifier(
std::get<Indirection<parser::OmpReductionSpecifier>>(x.t).value(),
- std::get<std::optional<parser::OmpClauseList>>(x.t),
- declaratives_.back());
+ maybeClauses ? *maybeClauses : empty, declaratives_.back());
return false;
}
bool Pre(const parser::OmpMapClause &);
@@ -1730,12 +1723,11 @@ class OmpVisitor : public virtual DeclarationVisitor {
void ProcessMapperSpecifier(const parser::OmpMapperSpecifier &spec,
const parser::OmpClauseList &clauses);
void ProcessReductionSpecifier(const parser::OmpReductionSpecifier &spec,
- const std::optional<parser::OmpClauseList> &clauses,
+ const parser::OmpClauseList &clauses,
const parser::OpenMPDeclarativeConstruct *wholeConstruct);
void ResolveCriticalName(const parser::OmpArgument &arg);
- int metaLevel_{0};
std::vector<const parser::OpenMPDeclarativeConstruct *> declaratives_;
};
@@ -1863,7 +1855,7 @@ std::string MangleDefinedOperator(const parser::CharBlock &name) {
void OmpVisitor::ProcessReductionSpecifier(
const parser::OmpReductionSpecifier &spec,
- const std::optional<parser::OmpClauseList> &clauses,
+ const parser::OmpClauseList &clauses,
const parser::OpenMPDeclarativeConstruct *construct) {
const parser::Name *name{nullptr};
parser::CharBlock mangledName;
@@ -1991,39 +1983,31 @@ void OmpVisitor::ResolveCriticalName(const parser::OmpArgument &arg) {
bool OmpVisitor::Pre(const parser::OmpDirectiveSpecification &x) {
AddOmpSourceRange(x.source);
- if (metaLevel_ == 0) {
- // Not in METADIRECTIVE.
- return true;
- }
- // If OmpDirectiveSpecification (which contains clauses) is a part of
- // METADIRECTIVE, some semantic checks may not be applicable.
- // Disable the semantic analysis for it in such cases to allow the compiler
- // to parse METADIRECTIVE without flagging errors.
- auto &maybeArgs{std::get<std::optional<parser::OmpArgumentList>>(x.t)};
- auto &maybeClauses{std::get<std::optional<parser::OmpClauseList>>(x.t)};
+ const parser::OmpArgumentList &args{x.Arguments()};
+ const parser::OmpClauseList &clauses{x.Clauses()};
switch (x.DirId()) {
case llvm::omp::Directive::OMPD_declare_mapper:
- if (maybeArgs && maybeClauses) {
- const parser::OmpArgument &first{maybeArgs->v.front()};
+ if (!args.v.empty()) {
+ const parser::OmpArgument &first{args.v.front()};
if (auto *spec{std::get_if<parser::OmpMapperSpecifier>(&first.u)}) {
- ProcessMapperSpecifier(*spec, *maybeClauses);
+ ProcessMapperSpecifier(*spec, clauses);
}
}
break;
case llvm::omp::Directive::OMPD_declare_reduction:
- if (maybeArgs && maybeClauses) {
- const parser::OmpArgument &first{maybeArgs->v.front()};
+ if (!args.v.empty()) {
+ const parser::OmpArgument &first{args.v.front()};
if (auto *spec{std::get_if<parser::OmpReductionSpecifier>(&first.u)}) {
- ProcessReductionSpecifier(*spec, maybeClauses, declaratives_.back());
+ ProcessReductionSpecifier(*spec, clauses, declaratives_.back());
}
}
break;
default:
// Default processing.
- Walk(maybeArgs);
- Walk(maybeClauses);
+ Walk(args);
+ Walk(clauses);
break;
}
return false;
>From e0ae3e5dd4817329f0e104e0ea7fd883754f442f Mon Sep 17 00:00:00 2001
From: Krzysztof Parzyszek <Krzysztof.Parzyszek at amd.com>
Date: Sat, 20 Sep 2025 09:58:43 -0500
Subject: [PATCH 3/5] [flang][OpenMP] Resolve all components of
OmpDirectiveSpecification
Fully resolve all arguments and clauses in OmpDirectiveSpecification
instead of just looking for special cases. Delegate resolution from
nodes that inherit from ODS to use the ODS resolution.
---
flang/lib/Semantics/resolve-names.cpp | 129 +++++++++++++-------------
1 file changed, 62 insertions(+), 67 deletions(-)
diff --git a/flang/lib/Semantics/resolve-names.cpp b/flang/lib/Semantics/resolve-names.cpp
index 13edb118a3286..5dd0e1fd5072e 100644
--- a/flang/lib/Semantics/resolve-names.cpp
+++ b/flang/lib/Semantics/resolve-names.cpp
@@ -1486,34 +1486,16 @@ class OmpVisitor : public virtual DeclarationVisitor {
bool Pre(const parser::OmpBlockConstruct &);
void Post(const parser::OmpBlockConstruct &);
bool Pre(const parser::OmpBeginDirective &x) {
- AddOmpSourceRange(x.source);
- // Manually resolve names in CRITICAL directives. This is because these
- // names do not denote Fortran objects, and the CRITICAL directive causes
- // them to be "auto-declared", i.e. inserted into the global scope.
- // More specifically, they are not expected to have explicit declarations,
- // and if they do the behavior is unspeficied.
- if (x.DirName().v == llvm::omp::Directive::OMPD_critical) {
- for (const parser::OmpArgument &arg : x.Arguments().v) {
- ResolveCriticalName(arg);
- }
- }
- return true;
+ return Pre(static_cast<const parser::OmpDirectiveSpecification &>(x));
}
- void Post(const parser::OmpBeginDirective &) {
- messageHandler().set_currStmtSource(std::nullopt);
+ void Post(const parser::OmpBeginDirective &x) {
+ Post(static_cast<const parser::OmpDirectiveSpecification &>(x));
}
bool Pre(const parser::OmpEndDirective &x) {
- AddOmpSourceRange(x.source);
- // Manually resolve names in CRITICAL directives.
- if (x.DirName().v == llvm::omp::Directive::OMPD_critical) {
- for (const parser::OmpArgument &arg : x.Arguments().v) {
- ResolveCriticalName(arg);
- }
- }
- return true;
+ return Pre(static_cast<const parser::OmpDirectiveSpecification &>(x));
}
- void Post(const parser::OmpEndDirective &) {
- messageHandler().set_currStmtSource(std::nullopt);
+ void Post(const parser::OmpEndDirective &x) {
+ Post(static_cast<const parser::OmpDirectiveSpecification &>(x));
}
bool Pre(const parser::OpenMPLoopConstruct &) {
@@ -1522,8 +1504,16 @@ class OmpVisitor : public virtual DeclarationVisitor {
}
void Post(const parser::OpenMPLoopConstruct &) { PopScope(); }
bool Pre(const parser::OmpBeginLoopDirective &x) {
- AddOmpSourceRange(x.source);
- return true;
+ return Pre(static_cast<const parser::OmpDirectiveSpecification &>(x));
+ }
+ void Post(const parser::OmpBeginLoopDirective &x) {
+ Post(static_cast<const parser::OmpDirectiveSpecification &>(x));
+ }
+ bool Pre(const parser::OmpEndLoopDirective &x) {
+ return Pre(static_cast<const parser::OmpDirectiveSpecification &>(x));
+ }
+ void Post(const parser::OmpEndLoopDirective &x) {
+ Post(static_cast<const parser::OmpDirectiveSpecification &>(x));
}
bool Pre(const parser::OpenMPDeclareMapperConstruct &x) {
@@ -1580,35 +1570,22 @@ class OmpVisitor : public virtual DeclarationVisitor {
}
bool Pre(const parser::OmpMapClause &);
- void Post(const parser::OmpBeginLoopDirective &) {
- messageHandler().set_currStmtSource(std::nullopt);
- }
- bool Pre(const parser::OmpEndLoopDirective &x) {
- AddOmpSourceRange(x.source);
- return true;
- }
- void Post(const parser::OmpEndLoopDirective &) {
- messageHandler().set_currStmtSource(std::nullopt);
- }
-
bool Pre(const parser::OpenMPSectionsConstruct &) {
PushScope(Scope::Kind::OtherConstruct, nullptr);
return true;
}
void Post(const parser::OpenMPSectionsConstruct &) { PopScope(); }
bool Pre(const parser::OmpBeginSectionsDirective &x) {
- AddOmpSourceRange(x.source);
- return true;
+ return Pre(static_cast<const parser::OmpDirectiveSpecification &>(x));
}
- void Post(const parser::OmpBeginSectionsDirective &) {
- messageHandler().set_currStmtSource(std::nullopt);
+ void Post(const parser::OmpBeginSectionsDirective &x) {
+ Post(static_cast<const parser::OmpDirectiveSpecification &>(x));
}
bool Pre(const parser::OmpEndSectionsDirective &x) {
- AddOmpSourceRange(x.source);
- return true;
+ return Pre(static_cast<const parser::OmpDirectiveSpecification &>(x));
}
- void Post(const parser::OmpEndSectionsDirective &) {
- messageHandler().set_currStmtSource(std::nullopt);
+ void Post(const parser::OmpEndSectionsDirective &x) {
+ Post(static_cast<const parser::OmpDirectiveSpecification &>(x));
}
bool Pre(const parser::OpenMPThreadprivate &) {
SkipImplicitTyping(true);
@@ -1710,6 +1687,9 @@ class OmpVisitor : public virtual DeclarationVisitor {
}
}
bool Pre(const parser::OmpDirectiveSpecification &x);
+ void Post(const parser::OmpDirectiveSpecification &) {
+ messageHandler().set_currStmtSource(std::nullopt);
+ }
bool Pre(const parser::OmpTypeSpecifier &x) {
BeginDeclTypeSpec();
@@ -1719,6 +1699,16 @@ class OmpVisitor : public virtual DeclarationVisitor {
EndDeclTypeSpec();
}
+ bool Pre(const parser::OpenMPConstruct &x) {
+ // Indicate that the current directive is not a declarative one.
+ declaratives_.push_back(nullptr);
+ return true;
+ }
+ void Post(const parser::OpenMPConstruct &) {
+ // Pop the null pointer.
+ declaratives_.pop_back();
+ }
+
private:
void ProcessMapperSpecifier(const parser::OmpMapperSpecifier &spec,
const parser::OmpClauseList &clauses);
@@ -1987,29 +1977,34 @@ bool OmpVisitor::Pre(const parser::OmpDirectiveSpecification &x) {
const parser::OmpArgumentList &args{x.Arguments()};
const parser::OmpClauseList &clauses{x.Clauses()};
- switch (x.DirId()) {
- case llvm::omp::Directive::OMPD_declare_mapper:
- if (!args.v.empty()) {
- const parser::OmpArgument &first{args.v.front()};
- if (auto *spec{std::get_if<parser::OmpMapperSpecifier>(&first.u)}) {
- ProcessMapperSpecifier(*spec, clauses);
- }
- }
- break;
- case llvm::omp::Directive::OMPD_declare_reduction:
- if (!args.v.empty()) {
- const parser::OmpArgument &first{args.v.front()};
- if (auto *spec{std::get_if<parser::OmpReductionSpecifier>(&first.u)}) {
- ProcessReductionSpecifier(*spec, clauses, declaratives_.back());
- }
- }
- break;
- default:
- // Default processing.
- Walk(args);
- Walk(clauses);
- break;
+ for (const parser::OmpArgument &arg : args.v) {
+ common::visit( //
+ common::visitors{
+ [&](const parser::OmpMapperSpecifier &spec) {
+ ProcessMapperSpecifier(spec, clauses);
+ },
+ [&](const parser::OmpReductionSpecifier &spec) {
+ ProcessReductionSpecifier(spec, clauses, declaratives_.back());
+ },
+ [&](const parser::OmpLocator &locator) {
+ // Manually resolve names in CRITICAL directives. This is because
+ // these names do not denote Fortran objects, and the CRITICAL
+ // directive causes them to be "auto-declared", i.e. inserted into
+ // the global scope. More specifically, they are not expected to
+ // have explicit declarations, and if they do the behavior is
+ // unspeficied.
+ if (x.DirId() == llvm::omp::Directive::OMPD_critical) {
+ ResolveCriticalName(arg);
+ } else {
+ Walk(locator);
+ }
+ },
+ },
+ arg.u);
}
+
+ Walk(clauses);
+
return false;
}
>From aa085d70f7e6e7d22e1810787dcfd4accb20a638 Mon Sep 17 00:00:00 2001
From: Krzysztof Parzyszek <Krzysztof.Parzyszek at amd.com>
Date: Sat, 20 Sep 2025 16:13:07 -0500
Subject: [PATCH 4/5] format
---
flang/lib/Parser/unparse.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/flang/lib/Parser/unparse.cpp b/flang/lib/Parser/unparse.cpp
index 2db60c9a78b0f..b06a8c1fa4374 100644
--- a/flang/lib/Parser/unparse.cpp
+++ b/flang/lib/Parser/unparse.cpp
@@ -3082,8 +3082,7 @@ template void Unparse<Expr>(llvm::raw_ostream &, const Expr &,
const common::LangOptions &, Encoding, bool, bool, preStatementType *,
AnalyzedObjectsAsFortran *);
-template void Unparse<parser::OpenMPDeclarativeConstruct>(
- llvm::raw_ostream &, const parser::OpenMPDeclarativeConstruct &,
- const common::LangOptions &, Encoding, bool, bool, preStatementType *,
- AnalyzedObjectsAsFortran *);
+template void Unparse<parser::OpenMPDeclarativeConstruct>(llvm::raw_ostream &,
+ const parser::OpenMPDeclarativeConstruct &, const common::LangOptions &,
+ Encoding, bool, bool, preStatementType *, AnalyzedObjectsAsFortran *);
} // namespace Fortran::parser
>From bc7d5988383d6404b786013f05fe890a92bcf06c Mon Sep 17 00:00:00 2001
From: Krzysztof Parzyszek <Krzysztof.Parzyszek at amd.com>
Date: Mon, 22 Sep 2025 13:05:06 -0500
Subject: [PATCH 5/5] Don't walk clauses twice
---
flang/lib/Semantics/resolve-names.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/flang/lib/Semantics/resolve-names.cpp b/flang/lib/Semantics/resolve-names.cpp
index 5dd0e1fd5072e..358bec20f243c 100644
--- a/flang/lib/Semantics/resolve-names.cpp
+++ b/flang/lib/Semantics/resolve-names.cpp
@@ -1976,15 +1976,18 @@ bool OmpVisitor::Pre(const parser::OmpDirectiveSpecification &x) {
const parser::OmpArgumentList &args{x.Arguments()};
const parser::OmpClauseList &clauses{x.Clauses()};
+ bool visitClauses{true};
for (const parser::OmpArgument &arg : args.v) {
common::visit( //
common::visitors{
[&](const parser::OmpMapperSpecifier &spec) {
ProcessMapperSpecifier(spec, clauses);
+ visitClauses = false;
},
[&](const parser::OmpReductionSpecifier &spec) {
ProcessReductionSpecifier(spec, clauses, declaratives_.back());
+ visitClauses = false;
},
[&](const parser::OmpLocator &locator) {
// Manually resolve names in CRITICAL directives. This is because
@@ -2003,7 +2006,9 @@ bool OmpVisitor::Pre(const parser::OmpDirectiveSpecification &x) {
arg.u);
}
- Walk(clauses);
+ if (visitClauses) {
+ Walk(clauses);
+ }
return false;
}
More information about the flang-commits
mailing list