Skip to content

[flang][OpenMP] Make Symbol::OmpFlagToClauseName static #113586

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 2 commits into from
Oct 24, 2024
Merged

[flang][OpenMP] Make Symbol::OmpFlagToClauseName static #113586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
712832a
[flang][OpenMP] Make Symbol::OmpFlagToClauseName static
kparzysz Oct 24, 2024
f02f830
Merge branch 'main' into users/kparzysz/flag-clause-name
kparzysz Oct 24, 2024
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
2 changes: 1 addition & 1 deletion flang/include/flang/Semantics/symbol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ class Symbol {
void set_offset(std::size_t offset) { offset_ = offset; }
// Give the symbol a name with a different source location but same chars.
void ReplaceName(const SourceName &);
std::string OmpFlagToClauseName(Flag ompFlag);
static std::string OmpFlagToClauseName(Flag ompFlag);

// Does symbol have this type of details?
template <typename D> bool has() const {
Expand Down
7 changes: 3 additions & 4 deletions flang/lib/Semantics/resolve-directives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2320,7 +2320,7 @@ void OmpAttributeVisitor::ResolveOmpObject(
if (auto *symbol{ResolveOmp(*name, ompFlag, currScope())}) {
auto checkExclusivelists =
[&](const Symbol *symbol1, Symbol::Flag firstOmpFlag,
Symbol *symbol2, Symbol::Flag secondOmpFlag) {
const Symbol *symbol2, Symbol::Flag secondOmpFlag) {
if ((symbol1->test(firstOmpFlag) &&
symbol2->test(secondOmpFlag)) ||
(symbol1->test(secondOmpFlag) &&
Expand All @@ -2330,9 +2330,8 @@ void OmpAttributeVisitor::ResolveOmpObject(
"appear on both %s and %s "
"clauses on a %s construct"_err_en_US,
symbol2->name(),
const_cast<Symbol *>(symbol1)->OmpFlagToClauseName(
firstOmpFlag),
symbol2->OmpFlagToClauseName(secondOmpFlag),
Symbol::OmpFlagToClauseName(firstOmpFlag),
Symbol::OmpFlagToClauseName(secondOmpFlag),
parser::ToUpperCaseLetters(
llvm::omp::getOpenMPDirectiveName(
GetContext().directive)
Expand Down
Loading