This is an archive of the discontinued LLVM Phabricator instance.

Differential D142965

[flang] Suppress a warning in D118631 [-Wunused-result]
ClosedPublic

Authored by sunshaoce on Jan 31 2023, 1:59 AM.

Details

Reviewers
klausler
Commits
rGf95bdff17b3e: [flang] Suppress a warning in D118631 [-Wunused-result]

Diff Detail

Event Timeline

sunshaoce created this revision.Jan 31 2023, 1:59 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJan 31 2023, 1:59 AM
sunshaoce requested review of this revision.Jan 31 2023, 1:59 AM
Herald added a subscriber: jdoerfert. · View Herald TranscriptJan 31 2023, 1:59 AM
Harbormaster completed remote builds in B210936: Diff 493527.Jan 31 2023, 2:20 AM
klausler accepted this revision.Jan 31 2023, 8:15 AM
klausler added inline comments.
flang/lib/Semantics/mod-file.cpp
966

std::erase() might be better

This revision is now accepted and ready to land.Jan 31 2023, 8:15 AM
Closed by commit rGf95bdff17b3e: [flang] Suppress a warning in D118631 [-Wunused-result] (authored by sunshaoce). · Explain WhyJan 31 2023, 8:30 AM
This revision was automatically updated to reflect the committed changes.
sunshaoce added a commit: rGf95bdff17b3e: [flang] Suppress a warning in D118631 [-Wunused-result].
sunshaoce added inline comments.Jan 31 2023, 8:30 AM
flang/lib/Semantics/mod-file.cpp
966

Yes, but requires C++ 20.

Revision Contents

PathSize
flang/
lib/
Semantics/
6 lines

Diff 493527

flang/lib/Semantics/mod-file.cpp

Show First 20 Lines • Show All 957 Lines • ▼ Show 20 LinesScope *ModFileReader::Read(const SourceName &name,
options.features.Enable(common::LanguageFeature::BackslashEscapes); options.features.Enable(common::LanguageFeature::BackslashEscapes);
options.features.Enable(common::LanguageFeature::OpenMP); options.features.Enable(common::LanguageFeature::OpenMP);
if (!isIntrinsic.value_or(false) && !notAModule) { if (!isIntrinsic.value_or(false) && !notAModule) {
// The search for this module file will scan non-intrinsic module // The search for this module file will scan non-intrinsic module
// directories. If a directory is in both the intrinsic and non-intrinsic // directories. If a directory is in both the intrinsic and non-intrinsic
// directory lists, the intrinsic module directory takes precedence. // directory lists, the intrinsic module directory takes precedence.
options.searchDirectories = context_.searchDirectories(); options.searchDirectories = context_.searchDirectories();
for (const auto &dir : context_.intrinsicModuleDirectories()) { for (const auto &dir : context_.intrinsicModuleDirectories()) {
options.searchDirectories.erase(
klauslerUnsubmitted
Not Done
ReplyInline Actions

std::erase() might be better

klausler: std::erase() might be better
sunshaoceAuthorUnsubmitted
Done
ReplyInline Actions

Yes, but requires C++ 20.

sunshaoce: Yes, but requires C++ 20.
std::remove(options.searchDirectories.begin(), std::remove(options.searchDirectories.begin(),
options.searchDirectories.end(), dir); options.searchDirectories.end(), dir),
options.searchDirectories.end());
} }
options.searchDirectories.insert(options.searchDirectories.begin(), "."s); options.searchDirectories.insert(options.searchDirectories.begin(), "."s);
} }
bool foundNonIntrinsicModuleFile{false}; bool foundNonIntrinsicModuleFile{false};
if (!isIntrinsic) { if (!isIntrinsic) {
std::list<std::string> searchDirs; std::list<std::string> searchDirs;
for (const auto &d : options.searchDirectories) { for (const auto &d : options.searchDirectories) {
searchDirs.push_back(d); searchDirs.push_back(d);
▲ Show 20 Lines • Show All 301 Lines • Show Last 20 Lines