[flang-commits] [flang] [flang][OpenMP] Rename "declare constructs" to directives, NFC (PR #194240)
via flang-commits
flang-commits at lists.llvm.org
Sun Apr 26 08:27:54 PDT 2026
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-flang-fir-hlfir
Author: Krzysztof Parzyszek (kparzysz)
<details>
<summary>Changes</summary>
Only executable directives are constructs in OpenMP, so, for example, "declare mapper" is not a construct.
Apply
find flang/ \( -name '*.cpp' -o -name '*.h' -o -name '*.f90' \) -exec sed \
-i -E -e 's/OpenMP(Declare[A-Za-z]*)Construct\b/Omp\1Directive/g' {} \;
plus local formatting updates as needed.
---
Patch is 50.52 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/194240.diff
26 Files Affected:
- (modified) flang/examples/FeatureList/FeatureList.cpp (+3-3)
- (modified) flang/include/flang/Parser/dump-parse-tree.h (+4-4)
- (modified) flang/include/flang/Parser/parse-tree.h (+10-11)
- (modified) flang/lib/Lower/OpenMP/OpenMP.cpp (+16-15)
- (modified) flang/lib/Parser/openmp-parsers.cpp (+8-8)
- (modified) flang/lib/Parser/unparse.cpp (+4-4)
- (modified) flang/lib/Semantics/assignment.cpp (+1-2)
- (modified) flang/lib/Semantics/assignment.h (+1-1)
- (modified) flang/lib/Semantics/check-omp-structure.cpp (+8-10)
- (modified) flang/lib/Semantics/check-omp-structure.h (+8-8)
- (modified) flang/lib/Semantics/resolve-directives.cpp (+11-12)
- (modified) flang/lib/Semantics/resolve-names.cpp (+5-5)
- (modified) flang/lib/Semantics/rewrite-parse-tree.cpp (+1-1)
- (modified) flang/lib/Semantics/unparse-with-symbols.cpp (+6-6)
- (modified) flang/test/Parser/OpenMP/declare-mapper-unparse.f90 (+2-2)
- (modified) flang/test/Parser/OpenMP/declare-reduction-combiner.f90 (+2-2)
- (modified) flang/test/Parser/OpenMP/declare-reduction-multi.f90 (+4-4)
- (modified) flang/test/Parser/OpenMP/declare-reduction-operator.f90 (+2-2)
- (modified) flang/test/Parser/OpenMP/declare-reduction-unparse.f90 (+2-2)
- (modified) flang/test/Parser/OpenMP/declare-target-indirect-tree.f90 (+2-2)
- (modified) flang/test/Parser/OpenMP/declare-target-to-clause.f90 (+1-1)
- (modified) flang/test/Parser/OpenMP/declare_target-device_type.f90 (+9-9)
- (modified) flang/test/Parser/OpenMP/enter-automap-modifier.f90 (+1-1)
- (modified) flang/test/Parser/OpenMP/linear-clause.f90 (+2-2)
- (modified) flang/test/Parser/OpenMP/openmp6-directive-spellings.f90 (+4-4)
- (modified) flang/test/Semantics/OpenMP/simd-only.f90 (+1-1)
``````````diff
diff --git a/flang/examples/FeatureList/FeatureList.cpp b/flang/examples/FeatureList/FeatureList.cpp
index 51d32bae40409..80683f90654a2 100644
--- a/flang/examples/FeatureList/FeatureList.cpp
+++ b/flang/examples/FeatureList/FeatureList.cpp
@@ -548,9 +548,9 @@ struct NodeVisitor {
READ_FEATURE(OpenMPConstruct)
READ_FEATURE(OpenMPCriticalConstruct)
READ_FEATURE(OpenMPDeclarativeConstruct)
- READ_FEATURE(OpenMPDeclareReductionConstruct)
- READ_FEATURE(OpenMPDeclareSimdConstruct)
- READ_FEATURE(OpenMPDeclareTargetConstruct)
+ READ_FEATURE(OmpDeclareReductionDirective)
+ READ_FEATURE(OmpDeclareSimdDirective)
+ READ_FEATURE(OmpDeclareTargetDirective)
READ_FEATURE(OmpMemoryOrderType)
READ_FEATURE(OmpAtomicDefaultMemOrderClause)
READ_FEATURE(OpenMPFlushConstruct)
diff --git a/flang/include/flang/Parser/dump-parse-tree.h b/flang/include/flang/Parser/dump-parse-tree.h
index 5d96befcd6dce..4bfeccfbe5c67 100644
--- a/flang/include/flang/Parser/dump-parse-tree.h
+++ b/flang/include/flang/Parser/dump-parse-tree.h
@@ -574,6 +574,10 @@ class ParseTreeDumper {
NODE(parser, OmpCombinerExpression)
NODE(parser, OmpContainsClause)
NODE(parser, OmpContextSelectorSpecification)
+ NODE(parser, OmpDeclareMapperDirective)
+ NODE(parser, OmpDeclareReductionDirective)
+ NODE(parser, OmpDeclareSimdDirective)
+ NODE(parser, OmpDeclareTargetDirective)
NODE(parser, OmpDeclareVariantDirective)
NODE(parser, OmpDefaultClause)
NODE_ENUM(OmpDefaultClause, DataSharingAttribute)
@@ -782,10 +786,6 @@ class ParseTreeDumper {
NODE(parser, OpenMPCriticalConstruct)
NODE(parser, OpenMPDeclarativeAssumes)
NODE(parser, OpenMPDeclarativeConstruct)
- NODE(parser, OpenMPDeclareMapperConstruct)
- NODE(parser, OpenMPDeclareReductionConstruct)
- NODE(parser, OpenMPDeclareSimdConstruct)
- NODE(parser, OpenMPDeclareTargetConstruct)
NODE(parser, OpenMPDepobjConstruct)
NODE(parser, OpenMPDispatchConstruct)
NODE(parser, OpenMPFlushConstruct)
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index 9f3dd5e0d1032..a07e47bf92bd1 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -5231,34 +5231,33 @@ struct OmpDeclareVariantDirective {
// declare-target-directive -> // since 4.5
// DECLARE_TARGET[(extended-list)] |
// DECLARE_TARGET clause-list
-struct OpenMPDeclareTargetConstruct {
+struct OmpDeclareTargetDirective {
WRAPPER_CLASS_BOILERPLATE(
- OpenMPDeclareTargetConstruct, OmpDirectiveSpecification);
+ OmpDeclareTargetDirective, OmpDirectiveSpecification);
CharBlock source;
};
// OMP v5.2: 5.8.8
// declare-mapper -> DECLARE MAPPER ([mapper-name :] type :: var) map-clauses
-struct OpenMPDeclareMapperConstruct {
+struct OmpDeclareMapperDirective {
WRAPPER_CLASS_BOILERPLATE(
- OpenMPDeclareMapperConstruct, OmpDirectiveSpecification);
+ OmpDeclareMapperDirective, OmpDirectiveSpecification);
CharBlock source;
};
// ref: 5.2: Section 5.5.11 139-141
// 2.16 declare-reduction -> DECLARE REDUCTION (reduction-identifier : type-list
// : combiner) [initializer-clause]
-struct OpenMPDeclareReductionConstruct {
+struct OmpDeclareReductionDirective {
WRAPPER_CLASS_BOILERPLATE(
- OpenMPDeclareReductionConstruct, OmpDirectiveSpecification);
+ OmpDeclareReductionDirective, OmpDirectiveSpecification);
CharBlock source;
};
// 2.8.2 declare-simd -> DECLARE SIMD [(proc-name)] [declare-simd-clause[ [,]
// declare-simd-clause]...]
-struct OpenMPDeclareSimdConstruct {
- WRAPPER_CLASS_BOILERPLATE(
- OpenMPDeclareSimdConstruct, OmpDirectiveSpecification);
+struct OmpDeclareSimdDirective {
+ WRAPPER_CLASS_BOILERPLATE(OmpDeclareSimdDirective, OmpDirectiveSpecification);
CharBlock source;
};
@@ -5319,8 +5318,8 @@ struct OpenMPDeclarativeConstruct {
UNION_CLASS_BOILERPLATE(OpenMPDeclarativeConstruct);
CharBlock source;
std::variant<OmpAllocateDirective, OpenMPDeclarativeAssumes,
- OpenMPDeclareMapperConstruct, OpenMPDeclareReductionConstruct,
- OpenMPDeclareSimdConstruct, OpenMPDeclareTargetConstruct,
+ OmpDeclareMapperDirective, OmpDeclareReductionDirective,
+ OmpDeclareSimdDirective, OmpDeclareTargetDirective,
OmpDeclareVariantDirective, OpenMPGroupprivate, OpenMPThreadprivate,
OpenMPRequiresConstruct, OpenMPUtilityConstruct,
OmpMetadirectiveDirective>
diff --git a/flang/lib/Lower/OpenMP/OpenMP.cpp b/flang/lib/Lower/OpenMP/OpenMP.cpp
index fd1a8b9cd5a42..6f3e19a84ef19 100644
--- a/flang/lib/Lower/OpenMP/OpenMP.cpp
+++ b/flang/lib/Lower/OpenMP/OpenMP.cpp
@@ -765,7 +765,7 @@ static void promoteNonCPtrUseDevicePtrArgsToUseDeviceAddr(
static void getDeclareTargetInfo(
lower::AbstractConverter &converter, semantics::SemanticsContext &semaCtx,
lower::pft::Evaluation &eval,
- const parser::OpenMPDeclareTargetConstruct &construct,
+ const parser::OmpDeclareTargetDirective &construct,
mlir::omp::DeclareTargetOperands &clauseOps,
llvm::SmallVectorImpl<DeclareTargetCaptureInfo> &symbolAndClause) {
@@ -804,7 +804,7 @@ static void getDeclareTargetInfo(
static void collectDeferredDeclareTargets(
lower::AbstractConverter &converter, semantics::SemanticsContext &semaCtx,
lower::pft::Evaluation &eval,
- const parser::OpenMPDeclareTargetConstruct &declareTargetConstruct,
+ const parser::OmpDeclareTargetDirective &declareTargetConstruct,
llvm::SmallVectorImpl<lower::OMPDeferredDeclareTargetInfo>
&deferredDeclareTarget) {
mlir::omp::DeclareTargetOperands clauseOps;
@@ -830,7 +830,7 @@ static std::optional<mlir::omp::DeclareTargetDeviceType>
getDeclareTargetFunctionDevice(
lower::AbstractConverter &converter, semantics::SemanticsContext &semaCtx,
lower::pft::Evaluation &eval,
- const parser::OpenMPDeclareTargetConstruct &declareTargetConstruct) {
+ const parser::OmpDeclareTargetDirective &declareTargetConstruct) {
mlir::omp::DeclareTargetOperands clauseOps;
llvm::SmallVector<DeclareTargetCaptureInfo> symbolAndClause;
getDeclareTargetInfo(converter, semaCtx, eval, declareTargetConstruct,
@@ -4112,7 +4112,7 @@ getReductionType(lower::AbstractConverter &converter,
// manufacture a combiner clause from the combiner expression on the reduction
// specifier and append it to the list of clauses.
static const clause::Combiner &
-appendCombiner(const parser::OpenMPDeclareReductionConstruct &construct,
+appendCombiner(const parser::OmpDeclareReductionDirective &construct,
List<Clause> &clauses, semantics::SemanticsContext &semaCtx) {
for (const Clause &clause : clauses) {
if (clause.id == llvm::omp::Clause::OMPC_combiner)
@@ -4138,7 +4138,7 @@ appendCombiner(const parser::OpenMPDeclareReductionConstruct &construct,
static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
semantics::SemanticsContext &semaCtx,
lower::pft::Evaluation &eval,
- const parser::OpenMPDeclareReductionConstruct &construct) {
+ const parser::OmpDeclareReductionDirective &construct) {
if (semaCtx.langOptions().OpenMPSimd)
return;
@@ -4235,7 +4235,7 @@ static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
static void
genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
semantics::SemanticsContext &semaCtx, lower::pft::Evaluation &eval,
- const parser::OpenMPDeclareSimdConstruct &declareSimdConstruct) {
+ const parser::OmpDeclareSimdDirective &declareSimdConstruct) {
mlir::Location loc = converter.getCurrentLocation();
const parser::OmpDirectiveSpecification &beginSpec = declareSimdConstruct.v;
List<Clause> clauses = makeClauses(beginSpec.Clauses(), semaCtx);
@@ -4252,10 +4252,11 @@ genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
mlir::omp::DeclareSimdOp::create(converter.getFirOpBuilder(), loc, clauseOps);
}
-static void genOpenMPDeclareMapperImpl(
- lower::AbstractConverter &converter, semantics::SemanticsContext &semaCtx,
- const parser::OpenMPDeclareMapperConstruct &construct,
- const semantics::Symbol *mapperSymOpt = nullptr) {
+static void
+genOpenMPDeclareMapperImpl(lower::AbstractConverter &converter,
+ semantics::SemanticsContext &semaCtx,
+ const parser::OmpDeclareMapperDirective &construct,
+ const semantics::Symbol *mapperSymOpt = nullptr) {
mlir::Location loc = converter.genLocation(construct.source);
fir::FirOpBuilder &firOpBuilder = converter.getFirOpBuilder();
const parser::OmpArgumentList &args = construct.v.Arguments();
@@ -4307,14 +4308,14 @@ static void genOpenMPDeclareMapperImpl(
static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
semantics::SemanticsContext &semaCtx,
lower::pft::Evaluation &eval,
- const parser::OpenMPDeclareMapperConstruct &construct) {
+ const parser::OmpDeclareMapperDirective &construct) {
genOpenMPDeclareMapperImpl(converter, semaCtx, construct);
}
static void
genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
semantics::SemanticsContext &semaCtx, lower::pft::Evaluation &eval,
- const parser::OpenMPDeclareTargetConstruct &declareTargetConstruct) {
+ const parser::OmpDeclareTargetDirective &declareTargetConstruct) {
mlir::omp::DeclareTargetOperands clauseOps;
llvm::SmallVector<DeclareTargetCaptureInfo> symbolAndClause;
mlir::ModuleOp mod = converter.getFirOpBuilder().getModule();
@@ -4850,7 +4851,7 @@ void Fortran::lower::gatherOpenMPDeferredDeclareTargets(
&deferredDeclareTarget) {
Fortran::common::visit(
common::visitors{
- [&](const parser::OpenMPDeclareTargetConstruct &ompReq) {
+ [&](const parser::OmpDeclareTargetDirective &ompReq) {
collectDeferredDeclareTargets(converter, semaCtx, eval, ompReq,
deferredDeclareTarget);
},
@@ -4865,7 +4866,7 @@ bool Fortran::lower::isOpenMPDeviceDeclareTarget(
const parser::OpenMPDeclarativeConstruct &ompDecl) {
return Fortran::common::visit(
common::visitors{
- [&](const parser::OpenMPDeclareTargetConstruct &ompReq) {
+ [&](const parser::OmpDeclareTargetDirective &ompReq) {
mlir::omp::DeclareTargetDeviceType targetType =
getDeclareTargetFunctionDevice(converter, semaCtx, eval, ompReq)
.value_or(mlir::omp::DeclareTargetDeviceType::host);
@@ -4972,7 +4973,7 @@ void Fortran::lower::materializeOpenMPDeclareMappers(
if (auto *md = sym.detailsIf<semantics::MapperDetails>()) {
for (const auto *decl : md->GetDeclList()) {
if (const auto *mapperDecl =
- std::get_if<parser::OpenMPDeclareMapperConstruct>(&decl->u)) {
+ std::get_if<parser::OmpDeclareMapperDirective>(&decl->u)) {
genOpenMPDeclareMapperImpl(converter, semaCtx, *mapperDecl, &sym);
}
}
diff --git a/flang/lib/Parser/openmp-parsers.cpp b/flang/lib/Parser/openmp-parsers.cpp
index 7798979ab2a6c..153d7ad4717c8 100644
--- a/flang/lib/Parser/openmp-parsers.cpp
+++ b/flang/lib/Parser/openmp-parsers.cpp
@@ -2319,13 +2319,13 @@ TYPE_PARSER(sourced(construct<OmpDeclareVariantDirective>(
OmpDirectiveSpecificationParser{})))
// 2.16 Declare Reduction Construct
-TYPE_PARSER(sourced(construct<OpenMPDeclareReductionConstruct>(
+TYPE_PARSER(sourced(construct<OmpDeclareReductionDirective>(
predicated(Parser<OmpDirectiveName>{},
IsDirective(llvm::omp::Directive::OMPD_declare_reduction)) >=
OmpStylizedInstanceCreator(OmpDirectiveSpecificationParser{}))))
// 2.10.6 Declare Target Construct
-TYPE_PARSER(sourced(construct<OpenMPDeclareTargetConstruct>(
+TYPE_PARSER(sourced(construct<OmpDeclareTargetDirective>(
predicated(Parser<OmpDirectiveName>{},
IsDirective(llvm::omp::Directive::OMPD_declare_target)) >=
OmpDirectiveSpecificationParser{})))
@@ -2355,7 +2355,7 @@ TYPE_PARSER(applyFunction<OmpMapperSpecifier>(ConstructOmpMapperSpecifier,
maybe(name / ":" / !":"_tok), typeSpec / "::", name))
// OpenMP 5.2: 5.8.8 Declare Mapper Construct
-TYPE_PARSER(sourced(construct<OpenMPDeclareMapperConstruct>(
+TYPE_PARSER(sourced(construct<OmpDeclareMapperDirective>(
predicated(Parser<OmpDirectiveName>{},
IsDirective(llvm::omp::Directive::OMPD_declare_mapper)) >=
OmpDirectiveSpecificationParser{})))
@@ -2367,7 +2367,7 @@ TYPE_PARSER(sourced(construct<OpenMPCriticalConstruct>(
OmpBlockConstructParser{llvm::omp::Directive::OMPD_critical})))
// 2.8.2 Declare Simd construct
-TYPE_PARSER(sourced(construct<OpenMPDeclareSimdConstruct>(
+TYPE_PARSER(sourced(construct<OmpDeclareSimdDirective>(
predicated(Parser<OmpDirectiveName>{},
IsDirective(llvm::omp::Directive::OMPD_declare_simd)) >=
OmpDirectiveSpecificationParser{})))
@@ -2403,13 +2403,13 @@ TYPE_PARSER(
sourced(construct<OpenMPDeclarativeConstruct>(
Parser<OpenMPDeclarativeAssumes>{}) ||
construct<OpenMPDeclarativeConstruct>(
- Parser<OpenMPDeclareReductionConstruct>{}) ||
+ Parser<OmpDeclareReductionDirective>{}) ||
construct<OpenMPDeclarativeConstruct>(
- Parser<OpenMPDeclareMapperConstruct>{}) ||
+ Parser<OmpDeclareMapperDirective>{}) ||
construct<OpenMPDeclarativeConstruct>(
- Parser<OpenMPDeclareSimdConstruct>{}) ||
+ Parser<OmpDeclareSimdDirective>{}) ||
construct<OpenMPDeclarativeConstruct>(
- Parser<OpenMPDeclareTargetConstruct>{}) ||
+ Parser<OmpDeclareTargetDirective>{}) ||
construct<OpenMPDeclarativeConstruct>(
Parser<OmpDeclareVariantDirective>{}) ||
construct<OpenMPDeclarativeConstruct>(
diff --git a/flang/lib/Parser/unparse.cpp b/flang/lib/Parser/unparse.cpp
index 99dbff44821cc..b980a51d3f249 100644
--- a/flang/lib/Parser/unparse.cpp
+++ b/flang/lib/Parser/unparse.cpp
@@ -2661,28 +2661,28 @@ class UnparseVisitor {
Put("\n");
EndOpenMP();
}
- void Unparse(const OpenMPDeclareMapperConstruct &x) {
+ void Unparse(const OmpDeclareMapperDirective &x) {
BeginOpenMP();
Word("!$OMP ");
Walk(x.v);
Put("\n");
EndOpenMP();
}
- void Unparse(const OpenMPDeclareReductionConstruct &x) {
+ void Unparse(const OmpDeclareReductionDirective &x) {
BeginOpenMP();
Word("!$OMP ");
Walk(x.v);
Put("\n");
EndOpenMP();
}
- void Unparse(const OpenMPDeclareSimdConstruct &x) {
+ void Unparse(const OmpDeclareSimdDirective &x) {
BeginOpenMP();
Word("!$OMP ");
Walk(x.v);
Put("\n");
EndOpenMP();
}
- void Unparse(const OpenMPDeclareTargetConstruct &x) {
+ void Unparse(const OmpDeclareTargetDirective &x) {
BeginOpenMP();
Word("!$OMP ");
Walk(x.v);
diff --git a/flang/lib/Semantics/assignment.cpp b/flang/lib/Semantics/assignment.cpp
index 1824a7d232d70..8dec228d4a40f 100644
--- a/flang/lib/Semantics/assignment.cpp
+++ b/flang/lib/Semantics/assignment.cpp
@@ -215,8 +215,7 @@ SemanticsContext &AssignmentChecker::context() {
AssignmentChecker::AssignmentChecker(SemanticsContext &context)
: context_{new AssignmentContext{context}} {}
-void AssignmentChecker::Enter(
- const parser::OpenMPDeclareReductionConstruct &x) {
+void AssignmentChecker::Enter(const parser::OmpDeclareReductionDirective &x) {
context().set_location(x.source);
}
void AssignmentChecker::Enter(const parser::AssignmentStmt &x) {
diff --git a/flang/lib/Semantics/assignment.h b/flang/lib/Semantics/assignment.h
index ba537744bfaaa..193feb8b92d3d 100644
--- a/flang/lib/Semantics/assignment.h
+++ b/flang/lib/Semantics/assignment.h
@@ -37,7 +37,7 @@ class AssignmentChecker : public virtual BaseChecker {
public:
explicit AssignmentChecker(SemanticsContext &);
~AssignmentChecker();
- void Enter(const parser::OpenMPDeclareReductionConstruct &x);
+ void Enter(const parser::OmpDeclareReductionDirective &x);
void Enter(const parser::AssignmentStmt &);
void Enter(const parser::PointerAssignmentStmt &);
void Enter(const parser::WhereStmt &);
diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp
index 2ece66166fb22..0f875893a82a6 100644
--- a/flang/lib/Semantics/check-omp-structure.cpp
+++ b/flang/lib/Semantics/check-omp-structure.cpp
@@ -1648,7 +1648,7 @@ void OmpStructureChecker::Leave(const parser::OpenMPThreadprivate &x) {
dirContext_.pop_back();
}
-void OmpStructureChecker::Enter(const parser::OpenMPDeclareSimdConstruct &x) {
+void OmpStructureChecker::Enter(const parser::OmpDeclareSimdDirective &x) {
const parser::OmpDirectiveName &dirName{x.v.DirName()};
PushContextAndClauseSets(dirName.source, dirName.v);
@@ -1709,7 +1709,7 @@ void OmpStructureChecker::Enter(const parser::OpenMPDeclareSimdConstruct &x) {
}
}
-void OmpStructureChecker::Leave(const parser::OpenMPDeclareSimdConstruct &) {
+void OmpStructureChecker::Leave(const parser::OmpDeclareSimdDirective &) {
dirContext_.pop_back();
}
@@ -2235,7 +2235,7 @@ void OmpStructureChecker::Enter(const parser::OmpClause::Allocate &x) {
}
}
-void OmpStructureChecker::Enter(const parser::OpenMPDeclareMapperConstruct &x) {
+void OmpStructureChecker::Enter(const parser::OmpDeclareMapperDirective &x) {
const parser::OmpDirectiveName &dirName{x.v.DirName()};
PushContextAndClauseSets(dirName.source, dirName.v);
@@ -2258,12 +2258,11 @@ void OmpStructureChecker::Enter(const parser::OpenMPDeclareMapperConstruct &x) {
}
}
-void OmpStructureChecker::Leave(const parser::OpenMPDeclareMapperConstruct &) {
+void OmpStructureChecker::Leave(const parser::OmpDeclareMapperDirective &) {
dirContext_.pop_back();
}
-void OmpStructureChecker::Enter(
- const parser::OpenMPDeclareReductionConstruct &x) {
+void OmpStructureChecker::Enter(const parser::OmpDeclareReductionDirective &x) {
const parser::OmpDirectiveName &dirName{x.v.DirName()};
PushContextAndClauseSets(dirName.source, dirName.v);
@@ -2281,8 +2280,7 @@ void OmpStructureChecker::Enter(
}
}
-void OmpStructureChecker::Leave(
- const parser::OpenMPDeclareReductionConstruct &) {
+void OmpStructureChecker::Leave(const parser::OmpDeclareReductionDirective &) {
dirContext_.pop_back();
}
@@ -2318,7 +2316,7 @@ void OmpStructureChecker::CheckSymbolNames(
}
}
-void OmpStructureChecker::Enter(const parser::OpenMPDeclareTargetConstruct &x) {
+void OmpStructureChecker::Enter(const parser::OmpDeclareTargetDirective &x) {
const parser::OmpDirectiveName &dirName{x.v.DirName()};
PushContext(dirName.source, dirName.v);
@@ -2366,7 +2364,7 @@ void OmpStructureChecker::Enter(const parser::OpenMPDeclareTargetConstruct &x) {
}
}
-void OmpStructureChecker::Leave(const parser::OpenMPDeclareTargetConstruct &x) {
+void OmpStructureChecker::Leave(const parser::OmpDeclareTargetDirective &x) {
const parser::OmpDirectiveName &dirName{x.v.DirName()};
// Handle both forms of DECLARE TARGET.
diff --git a/flang/lib/Semantics/check-omp-structure.h b/flang/lib/Semantics/check-omp-structure.h
index adb2c466ef87c..5bccf3576923e 100644
--- a/flang/lib/Semantics/check-omp-structure.h
+++ b/flang/lib/Semantics/check-omp-structure.h
@@ -124,16 +124,16 @@ class OmpStructureChecker : public OmpStructureCheckerBase {
void Enter(const parser::OmpDeclareVariantDirective &);
void Leave(const parser::OmpDeclareVariantDirective &);
- void Enter(const parser::OpenMPDeclareSimdConstruct &);
- void Leave(const parser::OpenMPDeclareSimdConstruct &);
+ void Enter(const parser::OmpDeclareSimdDirective &);
+ void Leave(const parser::OmpDeclareSimdDirective &);
void En...
[truncated]
``````````
</details>
https://github.com/llvm/llvm-project/pull/194240
More information about the flang-commits
mailing list