[flang-commits] [PATCH] D156759: [flang][openmp] Handle !$INCLUDE "foo" (bug #64128)

[Peter Klausler via Phabricator via flang-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG2734f15437b6: [flang][openmp] Handle !$INCLUDE "foo" (bug #64128) (authored by klausler).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D156759/new/

https://reviews.llvm.org/D156759

Files:
  flang/lib/Parser/prescan.cpp
  flang/test/Parser/OpenMP/cond-include.f90
  flang/test/Parser/OpenMP/cond-include.inc


Index: flang/test/Parser/OpenMP/cond-include.inc
===================================================================
--- /dev/null
+++ flang/test/Parser/OpenMP/cond-include.inc
@@ -0,0 +1 @@
+STOP "pass"
Index: flang/test/Parser/OpenMP/cond-include.f90
===================================================================
--- /dev/null
+++ flang/test/Parser/OpenMP/cond-include.f90
@@ -0,0 +1,4 @@
+! RUN: %flang_fc1 -fdebug-unparse -fopenmp %s | FileCheck %s
+!CHECK: STOP "pass"
+!$ include "cond-include.inc"
+end
Index: flang/lib/Parser/prescan.cpp
===================================================================
--- flang/lib/Parser/prescan.cpp
+++ flang/lib/Parser/prescan.cpp
@@ -106,7 +106,7 @@
   case LineClassification::Kind::PreprocessorDirective:
     preprocessor_.Directive(TokenizePreprocessorDirective(), *this);
     return;
-  case LineClassification::Kind::CompilerDirective:
+  case LineClassification::Kind::CompilerDirective: {
     directiveSentinel_ = line.sentinel;
     CHECK(InCompilerDirective());
     BeginStatementAndAdvance();
@@ -118,22 +118,22 @@
       }
       CHECK(*at_ == '!');
     }
+    std::optional<int> condOffset;
     if (directiveSentinel_[0] == '$' && directiveSentinel_[1] == '\0') {
-      // OpenMP conditional compilation line.  Remove the sentinel and then
-      // treat the line as if it were normal source.
-      at_ += 2, column_ += 2;
-      if (inFixedForm_) {
-        LabelField(tokens);
-      } else {
-        SkipSpaces();
-      }
+      // OpenMP conditional compilation line.
+      condOffset = 2;
     } else if (directiveSentinel_[0] == '@' && directiveSentinel_[1] == 'c' &&
         directiveSentinel_[2] == 'u' && directiveSentinel_[3] == 'f' &&
         directiveSentinel_[4] == '\0') {
-      // CUDA conditional compilation line.  Remove the sentinel and then
-      // treat the line as if it were normal source.
-      at_ += 5, column_ += 5;
-      if (inFixedForm_) {
+      // CUDA conditional compilation line.
+      condOffset = 5;
+    }
+    if (condOffset) {
+      at_ += *condOffset, column_ += *condOffset;
+      if (auto payload{IsIncludeLine(at_)}) {
+        FortranInclude(at_ + *payload);
+        return;
+      } else if (inFixedForm_) {
         LabelField(tokens);
       } else {
         SkipSpaces();
@@ -153,6 +153,7 @@
       tokens.CloseToken();
     }
     break;
+  }
   case LineClassification::Kind::Source:
     BeginStatementAndAdvance();
     if (inFixedForm_) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D156759.546165.patch
Type: text/x-patch
Size: 2484 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/flang-commits/attachments/20230801/862e7aa7/attachment-0001.bin>