Skip to content

[flang][OpenMP] Prescanning bug with !$ fixed form line continuation #135416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2025
Merged

[flang][OpenMP] Prescanning bug with !$ fixed form line continuation #135416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions flang/lib/Parser/prescan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,22 +1309,22 @@ const char *Prescanner::FixedFormContinuationLine(bool mightNeedSpace) {
tabInCurrentLine_ = false;
char col1{*nextLine_};
if (InCompilerDirective()) {
if (directiveSentinel_[0] == '$' && directiveSentinel_[1] == '\0') {
if (!IsFixedFormCommentChar(col1)) {
return nullptr;
} else if (directiveSentinel_[0] == '$' && directiveSentinel_[1] == '\0') {
// !$ OpenMP conditional compilation
if (preprocessingOnly_) {
// in -E mode, don't treat "!$ &" as a continuation
return nullptr;
} else if (IsFixedFormCommentChar(col1)) {
if (nextLine_[1] == '$') {
// accept but do not require a matching sentinel
if (!(nextLine_[2] == '&' || IsSpaceOrTab(&nextLine_[2]))) {
return nullptr;
}
} else {
return nullptr; // distinct directive
} else if (nextLine_[1] == '$') {
// accept but do not require a matching sentinel
if (!(nextLine_[2] == '&' || IsSpaceOrTab(&nextLine_[2]))) {
return nullptr;
}
} else {
return nullptr; // distinct directive
}
} else if (IsFixedFormCommentChar(col1)) {
} else { // all other directives
int j{1};
for (; j < 5; ++j) {
char ch{directiveSentinel_[j - 1]};
Expand All @@ -1339,8 +1339,6 @@ const char *Prescanner::FixedFormContinuationLine(bool mightNeedSpace) {
return nullptr;
}
}
} else {
return nullptr;
}
const char *col6{nextLine_ + 5};
if (*col6 != '\n' && *col6 != '0' && !IsSpaceOrTab(col6)) {
Expand Down
24 changes: 24 additions & 0 deletions flang/test/Parser/OpenMP/bug518.f
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
! RUN: %flang_fc1 -E %s 2>&1 | FileCheck %s --strict-whitespace --check-prefix=CHECK-E
! RUN: %flang_fc1 -fopenmp -fdebug-unparse %s 2>&1 | FileCheck %s --check-prefix=CHECK-OMP
! RUN: %flang_fc1 -fdebug-unparse %s 2>&1 | FileCheck %s --check-prefix=CHECK-NO-OMP

!$ thread = OMP_GET_MAX_THREADS()

!$omp parallel private(ia)
!$ continue
!$omp end parallel
end

!CHECK-E:{{^}}!$ thread = OMP_GET_MAX_THREADS()
!CHECK-E:{{^}}!$omp parallel private(ia)
!CHECK-E:{{^}}!$ continue
!CHECK-E:{{^}}!$omp end parallel

!CHECK-OMP:thread=omp_get_max_threads()
!CHECK-OMP:!$OMP PARALLEL PRIVATE(ia)
!CHECK-OMP: CONTINUE
!CHECK-OMP:!$OMP END PARALLEL

!CHECK-NO-OMP-NOT:thread=
!CHECK-NO-OMP-NOT:!$OMP
!CHECK-NO-OMP:END PROGRAM