[flang] Updated the parsing structure of some OpenAcc constructs to give better/more uniform inspection #138076

hmk46 · 2025-05-01T02:31:36Z

atomics: broke out the directives into their own sourced nodes; restructured the end directive to be sourced and enclose its verbatim content
block: added construct source
loop: added construct source; similarly restructured the end directive as above.

Updated the parsing structure of some OpenAcc constructs to give better/more uniform inspection: - atomics: broke out the directives into their own sourced nodes; restructured the end directive to be sourced and enclose its verbatim content - block: added construct source - loop: added construct source; similarly restructured the end directive as above.

llvmbot · 2025-05-01T02:32:14Z

@llvm/pr-subscribers-flang-parser

Author: Hugh Kadhem (hmk46)

Changes

atomics: broke out the directives into their own sourced nodes; restructured the end directive to be sourced and enclose its verbatim content
block: added construct source
loop: added construct source; similarly restructured the end directive as above.

Full diff: https://github.com/llvm/llvm-project/pull/138076.diff

3 Files Affected:

(modified) flang/include/flang/Parser/dump-parse-tree.h (+4)
(modified) flang/include/flang/Parser/parse-tree.h (+39-6)
(modified) flang/lib/Parser/openacc-parsers.cpp (+28-23)

diff --git a/flang/include/flang/Parser/dump-parse-tree.h b/flang/include/flang/Parser/dump-parse-tree.h
index c0cf90c4696b6..bfe286e3c5085 100644
--- a/flang/include/flang/Parser/dump-parse-tree.h
+++ b/flang/include/flang/Parser/dump-parse-tree.h
@@ -57,11 +57,15 @@ class ParseTreeDumper {
   NODE(format, IntrinsicTypeDataEditDesc)
   NODE(format::IntrinsicTypeDataEditDesc, Kind)
   NODE(parser, Abstract)
+  NODE(parser, AccAtomicCaptureDirective)
   NODE(parser, AccAtomicCapture)
   NODE(AccAtomicCapture, Stmt1)
   NODE(AccAtomicCapture, Stmt2)
+  NODE(parser, AccAtomicReadDirective)
   NODE(parser, AccAtomicRead)
+  NODE(parser, AccAtomicUpdateDirective)
   NODE(parser, AccAtomicUpdate)
+  NODE(parser, AccAtomicWriteDirective)
   NODE(parser, AccAtomicWrite)
   NODE(parser, AccBeginBlockDirective)
   NODE(parser, AccBeginCombinedDirective)
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index ca8473c6f9674..4138dcfc275e2 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -5243,38 +5243,65 @@ struct AccEndBlockDirective {
 };
 
 // ACC END ATOMIC
-EMPTY_CLASS(AccEndAtomic);
+struct AccEndAtomic {
+  WRAPPER_CLASS_BOILERPLATE(AccEndAtomic, Verbatim);
+  CharBlock source;
+};
 
 // ACC ATOMIC READ
+struct AccAtomicReadDirective {
+  TUPLE_CLASS_BOILERPLATE(AccAtomicReadDirective);
+  std::tuple<Verbatim, AccClauseList> t;
+  CharBlock source;
+};
+
 struct AccAtomicRead {
   TUPLE_CLASS_BOILERPLATE(AccAtomicRead);
-  std::tuple<Verbatim, AccClauseList, Statement<AssignmentStmt>,
+  std::tuple<AccAtomicReadDirective, Statement<AssignmentStmt>,
       std::optional<AccEndAtomic>>
       t;
 };
 
 // ACC ATOMIC WRITE
+struct AccAtomicWriteDirective {
+  TUPLE_CLASS_BOILERPLATE(AccAtomicWriteDirective);
+  std::tuple<Verbatim, AccClauseList> t;
+  CharBlock source;
+};
+
 struct AccAtomicWrite {
   TUPLE_CLASS_BOILERPLATE(AccAtomicWrite);
-  std::tuple<Verbatim, AccClauseList, Statement<AssignmentStmt>,
+  std::tuple<AccAtomicWriteDirective, Statement<AssignmentStmt>,
       std::optional<AccEndAtomic>>
       t;
 };
 
 // ACC ATOMIC UPDATE
+struct AccAtomicUpdateDirective {
+  TUPLE_CLASS_BOILERPLATE(AccAtomicUpdateDirective);
+  std::tuple<std::optional<Verbatim>, AccClauseList> t;
+  CharBlock source;
+};
+
 struct AccAtomicUpdate {
   TUPLE_CLASS_BOILERPLATE(AccAtomicUpdate);
-  std::tuple<std::optional<Verbatim>, AccClauseList, Statement<AssignmentStmt>,
+  std::tuple<AccAtomicUpdateDirective, Statement<AssignmentStmt>,
       std::optional<AccEndAtomic>>
       t;
 };
 
 // ACC ATOMIC CAPTURE
+struct AccAtomicCaptureDirective {
+  TUPLE_CLASS_BOILERPLATE(AccAtomicCaptureDirective);
+  std::tuple<Verbatim, AccClauseList> t;
+  CharBlock source;
+};
+
 struct AccAtomicCapture {
   TUPLE_CLASS_BOILERPLATE(AccAtomicCapture);
   WRAPPER_CLASS(Stmt1, Statement<AssignmentStmt>);
   WRAPPER_CLASS(Stmt2, Statement<AssignmentStmt>);
-  std::tuple<Verbatim, AccClauseList, Stmt1, Stmt2, AccEndAtomic> t;
+  std::tuple<AccAtomicCaptureDirective, Stmt1, Stmt2, AccEndAtomic> t;
 };
 
 struct OpenACCAtomicConstruct {
@@ -5287,6 +5314,7 @@ struct OpenACCAtomicConstruct {
 struct OpenACCBlockConstruct {
   TUPLE_CLASS_BOILERPLATE(OpenACCBlockConstruct);
   std::tuple<AccBeginBlockDirective, Block, AccEndBlockDirective> t;
+  CharBlock source;
 };
 
 struct OpenACCStandaloneDeclarativeConstruct {
@@ -5324,7 +5352,11 @@ struct OpenACCDeclarativeConstruct {
 };
 
 // OpenACC directives enclosing do loop
-EMPTY_CLASS(AccEndLoop);
+struct AccEndLoop {
+  WRAPPER_CLASS_BOILERPLATE(AccEndLoop, Verbatim);
+  CharBlock source;
+};
+
 struct OpenACCLoopConstruct {
   TUPLE_CLASS_BOILERPLATE(OpenACCLoopConstruct);
   OpenACCLoopConstruct(AccBeginLoopDirective &&a)
@@ -5332,6 +5364,7 @@ struct OpenACCLoopConstruct {
   std::tuple<AccBeginLoopDirective, std::optional<DoConstruct>,
       std::optional<AccEndLoop>>
       t;
+  CharBlock source;
 };
 
 struct OpenACCEndConstruct {
diff --git a/flang/lib/Parser/openacc-parsers.cpp b/flang/lib/Parser/openacc-parsers.cpp
index ad035e6ade321..a37aebe622e73 100644
--- a/flang/lib/Parser/openacc-parsers.cpp
+++ b/flang/lib/Parser/openacc-parsers.cpp
@@ -169,12 +169,12 @@ TYPE_PARSER(sourced(construct<AccLoopDirective>(
 TYPE_PARSER(construct<AccBeginLoopDirective>(
     sourced(Parser<AccLoopDirective>{}), Parser<AccClauseList>{}))
 
-TYPE_PARSER(construct<AccEndLoop>("END LOOP"_tok))
+TYPE_PARSER(
+    sourced(construct<AccEndLoop>(startAccLine >> verbatim("END LOOP"_tok))))
 
-TYPE_PARSER(construct<OpenACCLoopConstruct>(
+TYPE_PARSER(sourced(construct<OpenACCLoopConstruct>(
     sourced(Parser<AccBeginLoopDirective>{} / endAccLine),
-    maybe(Parser<DoConstruct>{}),
-    maybe(startAccLine >> Parser<AccEndLoop>{} / endAccLine)))
+    maybe(Parser<DoConstruct>{}), maybe(Parser<AccEndLoop>{} / endAccLine))))
 
 // 2.15.1 Routine directive
 TYPE_PARSER(sourced(construct<OpenACCRoutineConstruct>(verbatim("ROUTINE"_tok),
@@ -190,27 +190,32 @@ TYPE_PARSER(construct<AccBeginCombinedDirective>(
     sourced(Parser<AccCombinedDirective>{}), Parser<AccClauseList>{}))
 
 // 2.12 Atomic constructs
-TYPE_PARSER(construct<AccEndAtomic>(startAccLine >> "END ATOMIC"_tok))
+TYPE_PARSER(sourced(
+    construct<AccEndAtomic>(startAccLine >> verbatim("END ATOMIC"_tok))))
 
-TYPE_PARSER("ATOMIC" >> construct<AccAtomicRead>(verbatim("READ"_tok),
-                            Parser<AccClauseList>{} / endAccLine,
-                            statement(assignmentStmt),
-                            maybe(Parser<AccEndAtomic>{} / endAccLine)))
+TYPE_PARSER(sourced(construct<AccAtomicReadDirective>(
+    "ATOMIC" >> verbatim("READ"_tok), Parser<AccClauseList>{})))
+TYPE_PARSER(
+    construct<AccAtomicRead>(Parser<AccAtomicReadDirective>{} / endAccLine,
+        statement(assignmentStmt), maybe(Parser<AccEndAtomic>{} / endAccLine)))
 
-TYPE_PARSER("ATOMIC" >> construct<AccAtomicWrite>(verbatim("WRITE"_tok),
-                            Parser<AccClauseList>{} / endAccLine,
-                            statement(assignmentStmt),
-                            maybe(Parser<AccEndAtomic>{} / endAccLine)))
+TYPE_PARSER(sourced(construct<AccAtomicWriteDirective>(
+    "ATOMIC" >> verbatim("WRITE"_tok), Parser<AccClauseList>{})))
+TYPE_PARSER(
+    construct<AccAtomicWrite>(Parser<AccAtomicWriteDirective>{} / endAccLine,
+        statement(assignmentStmt), maybe(Parser<AccEndAtomic>{} / endAccLine)))
 
-TYPE_PARSER("ATOMIC" >>
-    construct<AccAtomicUpdate>(maybe(verbatim("UPDATE"_tok)),
-        Parser<AccClauseList>{} / endAccLine, statement(assignmentStmt),
-        maybe(Parser<AccEndAtomic>{} / endAccLine)))
+TYPE_PARSER(sourced(construct<AccAtomicUpdateDirective>(
+    "ATOMIC" >> maybe(verbatim("UPDATE"_tok)), Parser<AccClauseList>{})))
+TYPE_PARSER(
+    construct<AccAtomicUpdate>(Parser<AccAtomicUpdateDirective>{} / endAccLine,
+        statement(assignmentStmt), maybe(Parser<AccEndAtomic>{} / endAccLine)))
 
-TYPE_PARSER("ATOMIC" >>
-    construct<AccAtomicCapture>(verbatim("CAPTURE"_tok),
-        Parser<AccClauseList>{} / endAccLine, statement(assignmentStmt),
-        statement(assignmentStmt), Parser<AccEndAtomic>{} / endAccLine))
+TYPE_PARSER(sourced(construct<AccAtomicCaptureDirective>(
+    "ATOMIC" >> verbatim("CAPTURE"_tok), Parser<AccClauseList>{})))
+TYPE_PARSER(construct<AccAtomicCapture>(
+    Parser<AccAtomicCaptureDirective>{} / endAccLine, statement(assignmentStmt),
+    statement(assignmentStmt), Parser<AccEndAtomic>{} / endAccLine))
 
 TYPE_PARSER(
     sourced(construct<OpenACCAtomicConstruct>(Parser<AccAtomicRead>{})) ||
@@ -240,14 +245,14 @@ TYPE_PARSER(startAccLine >> sourced(construct<AccEndBlockDirective>("END"_tok >>
                                     construct<AccBlockDirective>(pure(
                                         llvm::acc::Directive::ACCD_data))))))
 
-TYPE_PARSER(construct<OpenACCBlockConstruct>(
+TYPE_PARSER(sourced(construct<OpenACCBlockConstruct>(
     Parser<AccBeginBlockDirective>{} / endAccLine, block,
     // NB, This allows mismatched directives, but semantics checks that they
     // match.
     recovery(withMessage("expected OpenACC end block directive"_err_en_US,
                  attempt(Parser<AccEndBlockDirective>{} / endAccLine)),
         construct<AccEndBlockDirective>(construct<AccBlockDirective>(
-            pure(llvm::acc::Directive::ACCD_data))))))
+            pure(llvm::acc::Directive::ACCD_data)))))))
 
 // Standalone constructs
 TYPE_PARSER(construct<OpenACCStandaloneConstruct>(

llvmbot · 2025-05-01T02:32:14Z

@llvm/pr-subscribers-openacc

Author: Hugh Kadhem (hmk46)

Changes

atomics: broke out the directives into their own sourced nodes; restructured the end directive to be sourced and enclose its verbatim content
block: added construct source
loop: added construct source; similarly restructured the end directive as above.

Full diff: https://github.com/llvm/llvm-project/pull/138076.diff

3 Files Affected:

(modified) flang/include/flang/Parser/dump-parse-tree.h (+4)
(modified) flang/include/flang/Parser/parse-tree.h (+39-6)
(modified) flang/lib/Parser/openacc-parsers.cpp (+28-23)

diff --git a/flang/include/flang/Parser/dump-parse-tree.h b/flang/include/flang/Parser/dump-parse-tree.h
index c0cf90c4696b6..bfe286e3c5085 100644
--- a/flang/include/flang/Parser/dump-parse-tree.h
+++ b/flang/include/flang/Parser/dump-parse-tree.h
@@ -57,11 +57,15 @@ class ParseTreeDumper {
   NODE(format, IntrinsicTypeDataEditDesc)
   NODE(format::IntrinsicTypeDataEditDesc, Kind)
   NODE(parser, Abstract)
+  NODE(parser, AccAtomicCaptureDirective)
   NODE(parser, AccAtomicCapture)
   NODE(AccAtomicCapture, Stmt1)
   NODE(AccAtomicCapture, Stmt2)
+  NODE(parser, AccAtomicReadDirective)
   NODE(parser, AccAtomicRead)
+  NODE(parser, AccAtomicUpdateDirective)
   NODE(parser, AccAtomicUpdate)
+  NODE(parser, AccAtomicWriteDirective)
   NODE(parser, AccAtomicWrite)
   NODE(parser, AccBeginBlockDirective)
   NODE(parser, AccBeginCombinedDirective)
diff --git a/flang/include/flang/Parser/parse-tree.h b/flang/include/flang/Parser/parse-tree.h
index ca8473c6f9674..4138dcfc275e2 100644
--- a/flang/include/flang/Parser/parse-tree.h
+++ b/flang/include/flang/Parser/parse-tree.h
@@ -5243,38 +5243,65 @@ struct AccEndBlockDirective {
 };
 
 // ACC END ATOMIC
-EMPTY_CLASS(AccEndAtomic);
+struct AccEndAtomic {
+  WRAPPER_CLASS_BOILERPLATE(AccEndAtomic, Verbatim);
+  CharBlock source;
+};
 
 // ACC ATOMIC READ
+struct AccAtomicReadDirective {
+  TUPLE_CLASS_BOILERPLATE(AccAtomicReadDirective);
+  std::tuple<Verbatim, AccClauseList> t;
+  CharBlock source;
+};
+
 struct AccAtomicRead {
   TUPLE_CLASS_BOILERPLATE(AccAtomicRead);
-  std::tuple<Verbatim, AccClauseList, Statement<AssignmentStmt>,
+  std::tuple<AccAtomicReadDirective, Statement<AssignmentStmt>,
       std::optional<AccEndAtomic>>
       t;
 };
 
 // ACC ATOMIC WRITE
+struct AccAtomicWriteDirective {
+  TUPLE_CLASS_BOILERPLATE(AccAtomicWriteDirective);
+  std::tuple<Verbatim, AccClauseList> t;
+  CharBlock source;
+};
+
 struct AccAtomicWrite {
   TUPLE_CLASS_BOILERPLATE(AccAtomicWrite);
-  std::tuple<Verbatim, AccClauseList, Statement<AssignmentStmt>,
+  std::tuple<AccAtomicWriteDirective, Statement<AssignmentStmt>,
       std::optional<AccEndAtomic>>
       t;
 };
 
 // ACC ATOMIC UPDATE
+struct AccAtomicUpdateDirective {
+  TUPLE_CLASS_BOILERPLATE(AccAtomicUpdateDirective);
+  std::tuple<std::optional<Verbatim>, AccClauseList> t;
+  CharBlock source;
+};
+
 struct AccAtomicUpdate {
   TUPLE_CLASS_BOILERPLATE(AccAtomicUpdate);
-  std::tuple<std::optional<Verbatim>, AccClauseList, Statement<AssignmentStmt>,
+  std::tuple<AccAtomicUpdateDirective, Statement<AssignmentStmt>,
       std::optional<AccEndAtomic>>
       t;
 };
 
 // ACC ATOMIC CAPTURE
+struct AccAtomicCaptureDirective {
+  TUPLE_CLASS_BOILERPLATE(AccAtomicCaptureDirective);
+  std::tuple<Verbatim, AccClauseList> t;
+  CharBlock source;
+};
+
 struct AccAtomicCapture {
   TUPLE_CLASS_BOILERPLATE(AccAtomicCapture);
   WRAPPER_CLASS(Stmt1, Statement<AssignmentStmt>);
   WRAPPER_CLASS(Stmt2, Statement<AssignmentStmt>);
-  std::tuple<Verbatim, AccClauseList, Stmt1, Stmt2, AccEndAtomic> t;
+  std::tuple<AccAtomicCaptureDirective, Stmt1, Stmt2, AccEndAtomic> t;
 };
 
 struct OpenACCAtomicConstruct {
@@ -5287,6 +5314,7 @@ struct OpenACCAtomicConstruct {
 struct OpenACCBlockConstruct {
   TUPLE_CLASS_BOILERPLATE(OpenACCBlockConstruct);
   std::tuple<AccBeginBlockDirective, Block, AccEndBlockDirective> t;
+  CharBlock source;
 };
 
 struct OpenACCStandaloneDeclarativeConstruct {
@@ -5324,7 +5352,11 @@ struct OpenACCDeclarativeConstruct {
 };
 
 // OpenACC directives enclosing do loop
-EMPTY_CLASS(AccEndLoop);
+struct AccEndLoop {
+  WRAPPER_CLASS_BOILERPLATE(AccEndLoop, Verbatim);
+  CharBlock source;
+};
+
 struct OpenACCLoopConstruct {
   TUPLE_CLASS_BOILERPLATE(OpenACCLoopConstruct);
   OpenACCLoopConstruct(AccBeginLoopDirective &&a)
@@ -5332,6 +5364,7 @@ struct OpenACCLoopConstruct {
   std::tuple<AccBeginLoopDirective, std::optional<DoConstruct>,
       std::optional<AccEndLoop>>
       t;
+  CharBlock source;
 };
 
 struct OpenACCEndConstruct {
diff --git a/flang/lib/Parser/openacc-parsers.cpp b/flang/lib/Parser/openacc-parsers.cpp
index ad035e6ade321..a37aebe622e73 100644
--- a/flang/lib/Parser/openacc-parsers.cpp
+++ b/flang/lib/Parser/openacc-parsers.cpp
@@ -169,12 +169,12 @@ TYPE_PARSER(sourced(construct<AccLoopDirective>(
 TYPE_PARSER(construct<AccBeginLoopDirective>(
     sourced(Parser<AccLoopDirective>{}), Parser<AccClauseList>{}))
 
-TYPE_PARSER(construct<AccEndLoop>("END LOOP"_tok))
+TYPE_PARSER(
+    sourced(construct<AccEndLoop>(startAccLine >> verbatim("END LOOP"_tok))))
 
-TYPE_PARSER(construct<OpenACCLoopConstruct>(
+TYPE_PARSER(sourced(construct<OpenACCLoopConstruct>(
     sourced(Parser<AccBeginLoopDirective>{} / endAccLine),
-    maybe(Parser<DoConstruct>{}),
-    maybe(startAccLine >> Parser<AccEndLoop>{} / endAccLine)))
+    maybe(Parser<DoConstruct>{}), maybe(Parser<AccEndLoop>{} / endAccLine))))
 
 // 2.15.1 Routine directive
 TYPE_PARSER(sourced(construct<OpenACCRoutineConstruct>(verbatim("ROUTINE"_tok),
@@ -190,27 +190,32 @@ TYPE_PARSER(construct<AccBeginCombinedDirective>(
     sourced(Parser<AccCombinedDirective>{}), Parser<AccClauseList>{}))
 
 // 2.12 Atomic constructs
-TYPE_PARSER(construct<AccEndAtomic>(startAccLine >> "END ATOMIC"_tok))
+TYPE_PARSER(sourced(
+    construct<AccEndAtomic>(startAccLine >> verbatim("END ATOMIC"_tok))))
 
-TYPE_PARSER("ATOMIC" >> construct<AccAtomicRead>(verbatim("READ"_tok),
-                            Parser<AccClauseList>{} / endAccLine,
-                            statement(assignmentStmt),
-                            maybe(Parser<AccEndAtomic>{} / endAccLine)))
+TYPE_PARSER(sourced(construct<AccAtomicReadDirective>(
+    "ATOMIC" >> verbatim("READ"_tok), Parser<AccClauseList>{})))
+TYPE_PARSER(
+    construct<AccAtomicRead>(Parser<AccAtomicReadDirective>{} / endAccLine,
+        statement(assignmentStmt), maybe(Parser<AccEndAtomic>{} / endAccLine)))
 
-TYPE_PARSER("ATOMIC" >> construct<AccAtomicWrite>(verbatim("WRITE"_tok),
-                            Parser<AccClauseList>{} / endAccLine,
-                            statement(assignmentStmt),
-                            maybe(Parser<AccEndAtomic>{} / endAccLine)))
+TYPE_PARSER(sourced(construct<AccAtomicWriteDirective>(
+    "ATOMIC" >> verbatim("WRITE"_tok), Parser<AccClauseList>{})))
+TYPE_PARSER(
+    construct<AccAtomicWrite>(Parser<AccAtomicWriteDirective>{} / endAccLine,
+        statement(assignmentStmt), maybe(Parser<AccEndAtomic>{} / endAccLine)))
 
-TYPE_PARSER("ATOMIC" >>
-    construct<AccAtomicUpdate>(maybe(verbatim("UPDATE"_tok)),
-        Parser<AccClauseList>{} / endAccLine, statement(assignmentStmt),
-        maybe(Parser<AccEndAtomic>{} / endAccLine)))
+TYPE_PARSER(sourced(construct<AccAtomicUpdateDirective>(
+    "ATOMIC" >> maybe(verbatim("UPDATE"_tok)), Parser<AccClauseList>{})))
+TYPE_PARSER(
+    construct<AccAtomicUpdate>(Parser<AccAtomicUpdateDirective>{} / endAccLine,
+        statement(assignmentStmt), maybe(Parser<AccEndAtomic>{} / endAccLine)))
 
-TYPE_PARSER("ATOMIC" >>
-    construct<AccAtomicCapture>(verbatim("CAPTURE"_tok),
-        Parser<AccClauseList>{} / endAccLine, statement(assignmentStmt),
-        statement(assignmentStmt), Parser<AccEndAtomic>{} / endAccLine))
+TYPE_PARSER(sourced(construct<AccAtomicCaptureDirective>(
+    "ATOMIC" >> verbatim("CAPTURE"_tok), Parser<AccClauseList>{})))
+TYPE_PARSER(construct<AccAtomicCapture>(
+    Parser<AccAtomicCaptureDirective>{} / endAccLine, statement(assignmentStmt),
+    statement(assignmentStmt), Parser<AccEndAtomic>{} / endAccLine))
 
 TYPE_PARSER(
     sourced(construct<OpenACCAtomicConstruct>(Parser<AccAtomicRead>{})) ||
@@ -240,14 +245,14 @@ TYPE_PARSER(startAccLine >> sourced(construct<AccEndBlockDirective>("END"_tok >>
                                     construct<AccBlockDirective>(pure(
                                         llvm::acc::Directive::ACCD_data))))))
 
-TYPE_PARSER(construct<OpenACCBlockConstruct>(
+TYPE_PARSER(sourced(construct<OpenACCBlockConstruct>(
     Parser<AccBeginBlockDirective>{} / endAccLine, block,
     // NB, This allows mismatched directives, but semantics checks that they
     // match.
     recovery(withMessage("expected OpenACC end block directive"_err_en_US,
                  attempt(Parser<AccEndBlockDirective>{} / endAccLine)),
         construct<AccEndBlockDirective>(construct<AccBlockDirective>(
-            pure(llvm::acc::Directive::ACCD_data))))))
+            pure(llvm::acc::Directive::ACCD_data)))))))
 
 // Standalone constructs
 TYPE_PARSER(construct<OpenACCStandaloneConstruct>(

klausler · 2025-05-06T20:10:46Z

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

@@ -57,11 +57,15 @@ class ParseTreeDumper {
  NODE(format, IntrinsicTypeDataEditDesc)
  NODE(format::IntrinsicTypeDataEditDesc, Kind)
  NODE(parser, Abstract)
+  NODE(parser, AccAtomicCaptureDirective)


These used to be in alphabetic order. Now they are not.

klausler · 2025-05-06T20:12:34Z

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

-EMPTY_CLASS(AccEndAtomic);
+struct AccEndAtomic {
+  WRAPPER_CLASS_BOILERPLATE(AccEndAtomic, Verbatim);
+  CharBlock source;


the Verbatim parse tree node has a source data member. That is its point. This new class doesn't add any value.

klausler · 2025-05-06T20:13:55Z

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

+struct AccAtomicReadDirective {
+  TUPLE_CLASS_BOILERPLATE(AccAtomicReadDirective);
+  std::tuple<Verbatim, AccClauseList> t;
+  CharBlock source;


Both Verbatim and AccClauseList nodes have source data members. Why do you need this one?

klausler · 2025-05-06T20:14:42Z

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

 struct OpenACCLoopConstruct {
  TUPLE_CLASS_BOILERPLATE(OpenACCLoopConstruct);
  OpenACCLoopConstruct(AccBeginLoopDirective &&a)
      : t({std::move(a), std::nullopt, std::nullopt}) {}
  std::tuple<AccBeginLoopDirective, std::optional<DoConstruct>,
      std::optional<AccEndLoop>>
      t;
+  CharBlock source;


Why do you need a source data member that covers an entire construct?

llvmbot added flang Flang issues not falling into any other category openacc flang:parser labels May 1, 2025

hmk46 requested review from clementval, razvanlupusoru, sscalpone and ktras May 1, 2025 02:36

razvanlupusoru requested a review from klausler May 6, 2025 20:03

klausler reviewed May 6, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[flang] Updated the parsing structure of some OpenAcc constructs to give better/more uniform inspection #138076

[flang] Updated the parsing structure of some OpenAcc constructs to give better/more uniform inspection #138076

hmk46 commented May 1, 2025

llvmbot commented May 1, 2025

llvmbot commented May 1, 2025

klausler May 6, 2025

klausler May 6, 2025

klausler May 6, 2025

klausler May 6, 2025

[flang] Updated the parsing structure of some OpenAcc constructs to give better/more uniform inspection #138076

Are you sure you want to change the base?

[flang] Updated the parsing structure of some OpenAcc constructs to give better/more uniform inspection #138076

Conversation

hmk46 commented May 1, 2025

llvmbot commented May 1, 2025

llvmbot commented May 1, 2025

klausler May 6, 2025

Choose a reason for hiding this comment

klausler May 6, 2025

Choose a reason for hiding this comment

klausler May 6, 2025

Choose a reason for hiding this comment

klausler May 6, 2025

Choose a reason for hiding this comment