Remove incorrect "begin" keyword.

This is only used in C++, so do not use it in the Fortran compiler.

Updated tests to suit.

Author: Leporacanthicus

flang/include/flang/Parser/dump-parse-tree.h

@@ -673,10 +673,10 @@ class ParseTreeDumper {
   NODE(parser, OpenACCStandaloneConstruct)
   NODE(parser, OpenACCWaitConstruct)
   NODE(parser, OpenMPAssumeConstruct)
+  NODE(parser, OpenMPDeclarativeAssumes)
+  NODE(parser, OmpAssumesPartConstruct)
+  NODE(parser, OmpAssumesDirective)
   NODE(parser, OpenMPAssumesConstruct)
-  NODE(parser, OpenMPAssumesPartConstruct)
-  NODE(parser, OmpBeginAssumesDirective)
-  NODE(parser, OpenMPBeginAssumesConstruct)
   NODE(parser, OmpEndAssumesDirective)
   NODE(parser, OpenMPAtomicConstruct)
   NODE(parser, OpenMPBlockConstruct)

flang/include/flang/Parser/parse-tree.h

@@ -4455,14 +4455,14 @@ struct OpenMPAssumeConstruct {
   CharBlock source;
 };
 
-struct OpenMPAssumesConstruct {
-  TUPLE_CLASS_BOILERPLATE(OpenMPAssumesConstruct);
+struct OpenMPDeclarativeAssumes {
+  TUPLE_CLASS_BOILERPLATE(OpenMPDeclarativeAssumes);
   std::tuple<Verbatim, OmpClauseList> t;
   CharBlock source;
 };
 
-struct OmpBeginAssumesDirective {
-  TUPLE_CLASS_BOILERPLATE(OmpBeginAssumesDirective);
+struct OmpAssumesDirective {
+  TUPLE_CLASS_BOILERPLATE(OmpAssumesDirective);
   std::tuple<Verbatim, OmpClauseList> t;
   CharBlock source;
 };
@@ -4474,14 +4474,14 @@ struct OmpEndAssumesDirective {
 
 //    structured-block
 // ...
-struct OpenMPAssumesPartConstruct {
-  WRAPPER_CLASS_BOILERPLATE(OpenMPAssumesPartConstruct, Block);
+struct OmpAssumesPartConstruct {
+  WRAPPER_CLASS_BOILERPLATE(OmpAssumesPartConstruct, Block);
   CharBlock source;
 };
 
-struct OpenMPBeginAssumesConstruct {
-  TUPLE_CLASS_BOILERPLATE(OpenMPBeginAssumesConstruct);
-  std::tuple<OmpBeginAssumesDirective, OpenMPAssumesPartConstruct,
+struct OpenMPAssumesConstruct {
+  TUPLE_CLASS_BOILERPLATE(OpenMPAssumesConstruct);
+  std::tuple<OmpAssumesDirective, OmpAssumesPartConstruct,
       OmpEndAssumesDirective>
       t;
   CharBlock source;
@@ -4620,7 +4620,8 @@ struct OpenMPDeclarativeAllocate {
 struct OpenMPDeclarativeConstruct {
   UNION_CLASS_BOILERPLATE(OpenMPDeclarativeConstruct);
   CharBlock source;
-  std::variant<OpenMPDeclarativeAllocate, OpenMPAssumesConstruct, OpenMPDeclareMapperConstruct,
+  std::variant<OpenMPDeclarativeAllocate, OpenMPAssumesConstruct, OpenMPDeclarativeAssume,
+      OpenMPDeclareMapperConstruct,
       OpenMPDeclareReductionConstruct, OpenMPDeclareSimdConstruct,
       OpenMPDeclareTargetConstruct, OpenMPThreadprivate,
       OpenMPRequiresConstruct, OpenMPUtilityConstruct>
@@ -4910,7 +4911,7 @@ struct OpenMPConstruct {
       OpenMPSectionConstruct, OpenMPLoopConstruct, OpenMPBlockConstruct,
       OpenMPAtomicConstruct, OpenMPDeclarativeAllocate, OpenMPDispatchConstruct,
       OpenMPUtilityConstruct, OpenMPExecutableAllocate,
-      OpenMPAllocatorsConstruct, OpenMPAssumeConstruct, OpenMPBeginAssumesConstruct, OpenMPCriticalConstruct>
+      OpenMPAllocatorsConstruct, OpenMPAssumeConstruct, OpenMPCriticalConstruct>
       u;
 };
 

flang/lib/Lower/OpenMP/OpenMP.cpp

@@ -3079,7 +3079,7 @@ 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::OpenMPAssumesConstruct &assumesConstruct) {
+                   const parser::OpenMPDeclarativeAssumes &assumesConstruct) {
   TODO(converter.getCurrentLocation(), "OpenMP ASSUMES declaration");
 }
 
@@ -3390,13 +3390,13 @@ static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
   TODO(clauseLocation, "OpenMP ASSUME construct");
 }
 
-static void
-genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
-       semantics::SemanticsContext &semaCtx, lower::pft::Evaluation &eval,
-       const parser::OpenMPBeginAssumesConstruct &beginAssumesConstruct) {
+static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,
+                   semantics::SemanticsContext &semaCtx,
+                   lower::pft::Evaluation &eval,
+                   const parser::OpenMPAssumesConstruct &assumesConstruct) {
   mlir::Location clauseLocation =
-      converter.genLocation(beginAssumesConstruct.source);
-  TODO(clauseLocation, "OpenMP BEGIN ASSUMES construct");
+      converter.genLocation(assumesConstruct.source);
+  TODO(clauseLocation, "OpenMP ASSUMES construct");
 }
 
 static void genOMP(lower::AbstractConverter &converter, lower::SymMap &symTable,

flang/lib/Parser/openmp-parsers.cpp

@@ -1296,14 +1296,14 @@ TYPE_PARSER(
     lookAhead(endOmpLine / !statement(allocateStmt)))
 
 // Assumes Construct
-TYPE_PARSER(sourced(construct<OpenMPAssumesConstruct>(
+TYPE_PARSER(sourced(construct<OpenMPDeclarativeAssumes>(
     verbatim("ASSUMES"_tok), Parser<OmpClauseList>{})))
 
 // Declarative constructs
 TYPE_PARSER(startOmpLine >>
     withMessage("expected OpenMP construct"_err_en_US,
         sourced(construct<OpenMPDeclarativeConstruct>(
-                Parser<OpenMPAssumesConstruct>{}) ||
+                Parser<OpenMPDeclarativeAssumes>{}) ||
             construct<OpenMPDeclarativeConstruct>(
                 Parser<OpenMPDeclareReductionConstruct>{}) ||
             construct<OpenMPDeclarativeConstruct>(
@@ -1327,17 +1327,17 @@ TYPE_PARSER(sourced(construct<OpenMPAssumeConstruct>(
                         verbatim("ASSUME"_tok), Parser<OmpClauseList>{}) /
     endOmpLine))
 
-TYPE_PARSER(sourced(construct<OmpBeginAssumesDirective>(
-    "BEGIN"_tok >> verbatim("ASSUMES"_tok), Parser<OmpClauseList>{})))
+TYPE_PARSER(sourced(construct<OmpAssumesDirective>(
+    verbatim("ASSUMES"_tok), Parser<OmpClauseList>{})))
 
 TYPE_PARSER(sourced(construct<OmpEndAssumesDirective>(
     verbatim(startOmpLine >> "END ASSUMES"_tok))))
 
-TYPE_PARSER(construct<OpenMPAssumesPartConstruct>(block))
+TYPE_PARSER(construct<OmpAssumesPartConstruct>(block))
 
-TYPE_PARSER(sourced(construct<OpenMPBeginAssumesConstruct>(
-    Parser<OmpBeginAssumesDirective>{} / endOmpLine,
-    Parser<OpenMPAssumesPartConstruct>{},
+TYPE_PARSER(sourced(construct<OpenMPAssumesConstruct>(
+    Parser<OmpAssumesDirective>{} / endOmpLine,
+    Parser<OmpAssumesPartConstruct>{},
     Parser<OmpEndAssumesDirective>{} / endOmpLine)))
 
 // Block Construct
@@ -1387,8 +1387,7 @@ TYPE_CONTEXT_PARSER("OpenMP construct"_en_US,
                 construct<OpenMPConstruct>(Parser<OpenMPExecutableAllocate>{}),
                 construct<OpenMPConstruct>(Parser<OpenMPAllocatorsConstruct>{}),
                 construct<OpenMPConstruct>(Parser<OpenMPDeclarativeAllocate>{}),
-                construct<OpenMPConstruct>(
-                    Parser<OpenMPBeginAssumesConstruct>{}),
+                construct<OpenMPConstruct>(Parser<OpenMPAssumesConstruct>{}),
                 construct<OpenMPConstruct>(Parser<OpenMPAssumeConstruct>{}),
                 construct<OpenMPConstruct>(Parser<OpenMPCriticalConstruct>{}))))
 

flang/lib/Parser/unparse.cpp

@@ -2648,9 +2648,9 @@ class UnparseVisitor {
     Put("\n");
     EndOpenMP();
   }
-  void Unparse(const OmpBeginAssumesDirective &x) {
+  void Unparse(const OmpAssumesDirective &x) {
     BeginOpenMP();
-    Word("!$OMP BEGIN ASSUMES");
+    Word("!$OMP ASSUMES");
     Walk(std::get<OmpClauseList>(x.t), ", ");
     Put("\n");
     EndOpenMP();
@@ -2718,6 +2718,12 @@ class UnparseVisitor {
     Put("\n");
     EndOpenMP();
   }
+  bool Pre(const OpenMPDeclarativeAssumes &x) {
+    Word("!$OMP ASSUMES ");
+    Walk(std::get<OmpClauseList>(x.t));
+    Put("\n");
+    EndOpenMP();
+  }
   void Unparse(const OpenMPDeclareMapperConstruct &z) {
     BeginOpenMP();
     Word("!$OMP DECLARE MAPPER (");

flang/lib/Semantics/check-omp-structure.cpp

@@ -1260,19 +1260,19 @@ void OmpStructureChecker::Leave(const parser::OpenMPAssumeConstruct &) {
   dirContext_.pop_back();
 }
 
-void OmpStructureChecker::Enter(const parser::OpenMPAssumesConstruct &x) {
+void OmpStructureChecker::Enter(const parser::OpenMPDeclarativeAssumes &x) {
   PushContextAndClauseSets(x.source, llvm::omp::Directive::OMPD_assumes);
 }
 
-void OmpStructureChecker::Leave(const parser::OpenMPAssumesConstruct &) {
+void OmpStructureChecker::Leave(const parser::OpenMPDeclarativeAssumes &) {
   dirContext_.pop_back();
 }
 
-void OmpStructureChecker::Enter(const parser::OpenMPBeginAssumesConstruct &x) {
+void OmpStructureChecker::Enter(const parser::OpenMPAssumesConstruct &x) {
   PushContextAndClauseSets(x.source, llvm::omp::Directive::OMPD_assumes);
 }
 
-void OmpStructureChecker::Leave(const parser::OpenMPBeginAssumesConstruct &) {
+void OmpStructureChecker::Leave(const parser::OpenMPAssumesConstruct &) {
   dirContext_.pop_back();
 }
 

flang/lib/Semantics/check-omp-structure.h

@@ -83,10 +83,10 @@ class OmpStructureChecker
 
   void Enter(const parser::OpenMPAssumeConstruct &);
   void Leave(const parser::OpenMPAssumeConstruct &);
+  void Enter(const parser::OpenMPDeclarativeAssumes &);
+  void Leave(const parser::OpenMPDeclarativeAssumes &);
   void Enter(const parser::OpenMPAssumesConstruct &);
   void Leave(const parser::OpenMPAssumesConstruct &);
-  void Enter(const parser::OpenMPBeginAssumesConstruct &);
-  void Leave(const parser::OpenMPBeginAssumesConstruct &);
   void Enter(const parser::OpenMPBlockConstruct &);
   void Leave(const parser::OpenMPBlockConstruct &);
   void Leave(const parser::OmpBeginBlockDirective &);

flang/test/Lower/OpenMP/Todo/assumes.f90

@@ -1,8 +1,10 @@
 ! RUN: %not_todo_cmd %flang_fc1 -emit-fir -fopenmp -fopenmp-version=51 -o - %s 2>&1 | FileCheck %s
 
-! CHECK: not yet implemented: OpenMP ASSUMES declaration
+! CHECK: not yet implemented: OpenMP ASSUMES construct
 program p
-!$omp assumes no_openmp
   integer r
+  r = 1
+!$omp assumes no_parallelism
   print *,r
+!$omp end assumes
 end program p

flang/test/Lower/OpenMP/Todo/begin-assumes.f90 renamed to flang/test/Lower/OpenMP/Todo/declarative-assumes.f90

@@ -1,9 +1,8 @@
 ! RUN: %not_todo_cmd %flang_fc1 -emit-fir -fopenmp -fopenmp-version=51 -o - %s 2>&1 | FileCheck %s
 
-! CHECK: not yet implemented: OpenMP BEGIN ASSUMES construct
+! CHECK: not yet implemented: OpenMP ASSUMES declaration
 program p
+!$omp assumes no_openmp
   integer r
-!$omp begin assumes no_parallelism
   print *,r
-!$omp end assumes
 end program p

flang/test/Parser/OpenMP/assumption.f90

@@ -31,16 +31,18 @@ end subroutine sub1
 
 subroutine sub2
   integer :: r
-!CHECK !$OMP BEGIN ASSUMES NO_OPENMP
-!PARSE-TREE: ExecutionPartConstruct -> ExecutableConstruct -> OpenMPConstruct -> OpenMPBeginAssumesConstruct
-!PARSE-TREE: OmpBeginAssumesDirective
+  integer :: v
+!CHECK !$OMP ASSUMES NO_OPENMP
+!PARSE-TREE: ExecutionPartConstruct -> ExecutableConstruct -> OpenMPConstruct -> OpenMPAssumesConstruct
+!PARSE-TREE: OmpAssumesDirective
 !PARSE-TREE: Verbatim
 !PARSE-TREE: OmpClauseList -> OmpClause -> NoOpenmp
-!PARSE-TREE: OpenMPAssumesPartConstruct -> Block
+!PARSE-TREE: OmpAssumesPartConstruct -> Block
 !PARSE-TREE: ExecutionPartConstruct -> ExecutableConstruct -> ActionStmt -> AssignmentStmt
 !PARSE-TREE: Expr -> Add
-!PARSE-TREE: OmpEndAssumesDirective
-  !$omp begin assumes no_openmp
+  !PARSE-TREE: OmpEndAssumesDirective
+  v = 87
+  !$omp assumes no_openmp
   r = r + 1
 !CHECK !$OMP END ASSUMES
   !$omp end assumes
@@ -49,7 +51,7 @@ end subroutine sub2
 program p
 !CHECK !$OMP ASSUMES NO_OPENMP
 !PARSE-TREE: SpecificationPart
-!PARSE-TREE:   OpenMPDeclarativeConstruct -> OpenMPAssumesConstruct
+!PARSE-TREE:   OpenMPDeclarativeConstruct -> OpenMPDeclarativeAssumes
 !PARSE-TREE: Verbatim
 !PARSE-TREE: OmpClauseList -> OmpClause -> NoOpenmp
   !$omp assumes no_openmp