From 6b4fe2f602f93159c0b82f5eb9c5433397caaf34 Mon Sep 17 00:00:00 2001 From: Krzysztof Parzyszek Date: Fri, 1 Aug 2025 14:37:13 -0500 Subject: [PATCH] [flang][OpenMP] Remove unused class OmpMemoryOrderClause, NFC --- flang/examples/FeatureList/FeatureList.cpp | 1 - flang/include/flang/Parser/dump-parse-tree.h | 1 - flang/include/flang/Parser/parse-tree.h | 12 ------------ flang/lib/Parser/openmp-parsers.cpp | 14 -------------- flang/lib/Parser/unparse.cpp | 1 - 5 files changed, 29 deletions(-) diff --git a/flang/examples/FeatureList/FeatureList.cpp b/flang/examples/FeatureList/FeatureList.cpp index 0b8066e36312b..b686430e7f583 100644 --- a/flang/examples/FeatureList/FeatureList.cpp +++ b/flang/examples/FeatureList/FeatureList.cpp @@ -554,7 +554,6 @@ struct NodeVisitor { READ_FEATURE(OpenMPDeclareSimdConstruct) READ_FEATURE(OpenMPDeclareTargetConstruct) READ_FEATURE(OmpMemoryOrderType) - READ_FEATURE(OmpMemoryOrderClause) READ_FEATURE(OmpAtomicDefaultMemOrderClause) READ_FEATURE(OpenMPFlushConstruct) READ_FEATURE(OpenMPLoopConstruct) diff --git a/flang/include/flang/Parser/dump-parse-tree.h b/flang/include/flang/Parser/dump-parse-tree.h index 68e402ca469ba..2c666a6d09a7b 100644 --- a/flang/include/flang/Parser/dump-parse-tree.h +++ b/flang/include/flang/Parser/dump-parse-tree.h @@ -721,7 +721,6 @@ class ParseTreeDumper { NODE(parser, OpenMPDeclareTargetConstruct) NODE(parser, OpenMPDeclareMapperConstruct) NODE_ENUM(common, OmpMemoryOrderType) - NODE(parser, OmpMemoryOrderClause) NODE(parser, OmpAtomicDefaultMemOrderClause) NODE(parser, OpenMPDepobjConstruct) NODE(parser, OpenMPUtilityConstruct) diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h index 7807db471db7d..8302e40984af0 100644 --- a/flang/include/flang/Parser/parse-tree.h +++ b/flang/include/flang/Parser/parse-tree.h @@ -270,7 +270,6 @@ struct OpenMPConstruct; struct OpenMPLoopConstruct; struct OpenMPDeclarativeConstruct; struct OmpEndLoopDirective; -struct OmpMemoryOrderClause; struct CUFKernelDoConstruct; // Cooked character stream locations @@ -5016,17 +5015,6 @@ struct OpenMPAllocatorsConstruct : public OmpBlockConstruct { OpenMPAllocatorsConstruct, OmpBlockConstruct); }; -// 2.17.7 Atomic construct/2.17.8 Flush construct [OpenMP 5.0] -// memory-order-clause -> acq_rel -// acquire -// release -// relaxed -// seq_cst -struct OmpMemoryOrderClause { - WRAPPER_CLASS_BOILERPLATE(OmpMemoryOrderClause, OmpClause); - CharBlock source; -}; - struct OpenMPAtomicConstruct : public OmpBlockConstruct { llvm::omp::Clause GetKind() const; bool IsCapture() const; diff --git a/flang/lib/Parser/openmp-parsers.cpp b/flang/lib/Parser/openmp-parsers.cpp index 7daba338a3840..84d1e81bfd9be 100644 --- a/flang/lib/Parser/openmp-parsers.cpp +++ b/flang/lib/Parser/openmp-parsers.cpp @@ -1619,20 +1619,6 @@ bool OmpAtomicConstructParser::recursing_{false}; TYPE_PARSER(sourced( // construct(OmpAtomicConstructParser{}))) -// 2.17.7 Atomic construct/2.17.8 Flush construct [OpenMP 5.0] -// memory-order-clause -> -// acq_rel -// acquire -// relaxed -// release -// seq_cst -TYPE_PARSER(sourced(construct( - sourced("ACQ_REL" >> construct(construct()) || - "ACQUIRE" >> construct(construct()) || - "RELAXED" >> construct(construct()) || - "RELEASE" >> construct(construct()) || - "SEQ_CST" >> construct(construct()))))) - static bool IsSimpleStandalone(const OmpDirectiveName &name) { switch (name.v) { case llvm::omp::Directive::OMPD_barrier: diff --git a/flang/lib/Parser/unparse.cpp b/flang/lib/Parser/unparse.cpp index 44f31ca2c52bf..46141e2ccab56 100644 --- a/flang/lib/Parser/unparse.cpp +++ b/flang/lib/Parser/unparse.cpp @@ -2801,7 +2801,6 @@ class UnparseVisitor { EndOpenMP(); } void Unparse(const OmpFailClause &x) { Walk(x.v); } - void Unparse(const OmpMemoryOrderClause &x) { Walk(x.v); } void Unparse(const OmpMetadirectiveDirective &x) { BeginOpenMP(); Word("!$OMP METADIRECTIVE ");