shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

[flang] Fix test breakage from recent preprocessor change (#184455)

Browse Source 
!$omp must never be recognized as a compiler directive sentinel when it
is immediately followed by anything other than a space or &. Revert a
bit of a recent change that broke this.
This commit is contained in:
Peter Klausler 2026-03-03 16:00:20 -08:00 committed by GitHub
parent 630b9570d1
commit 60d729fdb2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,8 +46,7 @@ Prescanner::Prescanner(const Prescanner &that, Preprocessor &prepro,
prescannerNesting_{that.prescannerNesting_ + 1},
skipLeadingAmpersand_{that.skipLeadingAmpersand_},
compilerDirectiveBloomFilter_{that.compilerDirectiveBloomFilter_},
compilerDirectiveSentinels_{that.compilerDirectiveSentinels_},
maxSentinelLength_{that.maxSentinelLength_} {}
compilerDirectiveSentinels_{that.compilerDirectiveSentinels_} {}
// Returns number of bytes to skip
static inline int IsSpace(const char *p) {
@ -1731,10 +1730,6 @@ Prescanner &Prescanner::AddCompilerDirectiveSentinel(const std::string &dir) {
compilerDirectiveBloomFilter_.set(packed % prime1);
compilerDirectiveBloomFilter_.set(packed % prime2);
compilerDirectiveSentinels_.insert(dir);
int len{static_cast<int>(dir.size())};
if (len > maxSentinelLength_) {
maxSentinelLength_ = len;
}
return *this;
}
@ -1789,19 +1784,15 @@ const char *Prescanner::IsCompilerDirectiveSentinel(CharBlock token) const {
while (end > p && (end[-1] == ' ' || end[-1] == '\t')) {
--end;
}
if (end > p + maxSentinelLength_) {
end = p + maxSentinelLength_;
}
return end > p && IsCompilerDirectiveSentinel(p, end - p) ? p : nullptr;
}
std::optional<std::pair<const char *, const char *>>
Prescanner::IsCompilerDirectiveSentinel(const char *p) const {
char sentinel[8];
std::size_t maxLen{static_cast<std::size_t>(maxSentinelLength_)};
for (std::size_t j{0}; j + 1 < sizeof sentinel; ++p, ++j) {
if (int n{IsSpaceOrTab(p)};
n || j >= maxLen || !(IsLetter(*p) || *p == '$' || *p == '@')) {
n || !(IsLetter(*p) || *p == '$' || *p == '@')) {
if (j <= 1 && sentinel[0] == '$' && n == 0 && *p != '&' && *p != '\n') {
// Free form OpenMP conditional compilation line sentinels have to
// be immediately followed by a space or &, not a digit

1
flang/lib/Parser/prescan.h
View File

@ -324,7 +324,6 @@ private:
static const int prime1{1019}, prime2{1021};
std::bitset<prime2> compilerDirectiveBloomFilter_; // 128 bytes
std::unordered_set<std::string> compilerDirectiveSentinels_;
int maxSentinelLength_{0};
};
} // namespace Fortran::parser
#endif // FORTRAN_PARSER_PRESCAN_H_

5
flang/test/Parser/not-sentinel.f90 Normal file
View File

@ -0,0 +1,5 @@
!RUN: flang -fc1 -fopenmp -fdebug-unparse %s 2>&1 | FileCheck %s
!CHECK-NOT: error:
!CHECK: END PROGRAM
!$ompx foo
end