caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
The logic for fixed form compiler directive line continuation has a hole
that can apply continuation for !$ even if the next line does not begin
with a fixed form comment character. Rearrange the nested if statements
to enforce that requirement for all compiler directives.
This commit is contained in:
Peter Klausler
2025-04-14 08:59:52 -07:00
committed by GitHub
parent 13b55ad3bb
commit 882200684b
2 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
flang/lib/Parser/prescan.cpp
View File

@@ -1315,22 +1315,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]};
@@ -1345,8 +1345,6 @@ const char *Prescanner::FixedFormContinuationLine(bool mightNeedSpace) {
return nullptr;
}
}
} else {
return nullptr;
}
const char *col6{nextLine_ + 5};
if (*col6 != '\n' && *col6 != '0' && !IsSpaceOrTab(col6)) {

24
flang/test/Parser/OpenMP/bug518.f Normal file
View File

@@ -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