Skip to content

[clang-tidy][NFC] Do less unnecessary work in modernize-deprecated-headers #160967

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −44
Open

[clang-tidy][NFC] Do less unnecessary work in modernize-deprecated-headers #160967

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
76 changes: 33 additions & 43 deletions clang-tools-extra/clang-tidy/modernize/DeprecatedHeadersCheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ namespace {
class IncludeModernizePPCallbacks : public PPCallbacks {
public:
explicit IncludeModernizePPCallbacks(
std::vector<IncludeMarker> &IncludesToBeProcessed, LangOptions LangOpts,
const SourceManager &SM, bool CheckHeaderFile);
std::vector<IncludeMarker> &IncludesToBeProcessed,
const LangOptions &LangOpts, const SourceManager &SM,
bool CheckHeaderFile);

void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
StringRef FileName, bool IsAngled,
Expand All @@ -37,8 +38,7 @@ class IncludeModernizePPCallbacks : public PPCallbacks {

private:
std::vector<IncludeMarker> &IncludesToBeProcessed;
LangOptions LangOpts;
llvm::StringMap<std::string> CStyledHeaderToCxx;
llvm::StringMap<StringRef> CStyledHeaderToCxx;
llvm::StringSet<> DeleteHeaders;
const SourceManager &SM;
bool CheckHeaderFile;
Expand Down Expand Up @@ -131,48 +131,38 @@ void DeprecatedHeadersCheck::check(
}

IncludeModernizePPCallbacks::IncludeModernizePPCallbacks(
std::vector<IncludeMarker> &IncludesToBeProcessed, LangOptions LangOpts,
const SourceManager &SM, bool CheckHeaderFile)
: IncludesToBeProcessed(IncludesToBeProcessed), LangOpts(LangOpts), SM(SM),
std::vector<IncludeMarker> &IncludesToBeProcessed,
const LangOptions &LangOpts, const SourceManager &SM, bool CheckHeaderFile)
: IncludesToBeProcessed(IncludesToBeProcessed), SM(SM),
CheckHeaderFile(CheckHeaderFile) {
for (const auto &KeyValue :
std::vector<std::pair<llvm::StringRef, std::string>>(
{{"assert.h", "cassert"},
{"complex.h", "complex"},
{"ctype.h", "cctype"},
{"errno.h", "cerrno"},
{"float.h", "cfloat"},
{"limits.h", "climits"},
{"locale.h", "clocale"},
{"math.h", "cmath"},
{"setjmp.h", "csetjmp"},
{"signal.h", "csignal"},
{"stdarg.h", "cstdarg"},
{"stddef.h", "cstddef"},
{"stdio.h", "cstdio"},
{"stdlib.h", "cstdlib"},
{"string.h", "cstring"},
{"time.h", "ctime"},
{"wchar.h", "cwchar"},
{"wctype.h", "cwctype"}})) {

static constexpr std::pair<StringRef, StringRef> CXX98Headers[] = {
{"assert.h", "cassert"}, {"complex.h", "complex"},
{"ctype.h", "cctype"}, {"errno.h", "cerrno"},
{"float.h", "cfloat"}, {"limits.h", "climits"},
{"locale.h", "clocale"}, {"math.h", "cmath"},
{"setjmp.h", "csetjmp"}, {"signal.h", "csignal"},
{"stdarg.h", "cstdarg"}, {"stddef.h", "cstddef"},
{"stdio.h", "cstdio"}, {"stdlib.h", "cstdlib"},
{"string.h", "cstring"}, {"time.h", "ctime"},
{"wchar.h", "cwchar"}, {"wctype.h", "cwctype"},
};
for (const auto &KeyValue : CXX98Headers)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

CStyledHeaderToCxx.insert(std::begin(CXX98Headers), std::end(CXX98Headers));

CStyledHeaderToCxx.insert(KeyValue);
}
// Add C++11 headers.
if (LangOpts.CPlusPlus11) {
for (const auto &KeyValue :
std::vector<std::pair<llvm::StringRef, std::string>>(
{{"fenv.h", "cfenv"},
{"stdint.h", "cstdint"},
{"inttypes.h", "cinttypes"},
{"tgmath.h", "ctgmath"},
{"uchar.h", "cuchar"}})) {

static constexpr std::pair<StringRef, StringRef> CXX11Headers[] = {
{"fenv.h", "cfenv"}, {"stdint.h", "cstdint"},
{"inttypes.h", "cinttypes"}, {"tgmath.h", "ctgmath"},
{"uchar.h", "cuchar"},
};
if (LangOpts.CPlusPlus11)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

if (LangOpts.CPlusPlus11)
  CStyledHeaderToCxx.insert(std::begin(CXX11Headers), std::end(CXX11Headers));

for (const auto &KeyValue : CXX11Headers)
CStyledHeaderToCxx.insert(KeyValue);
}
}
for (const auto &Key :
std::vector<std::string>({"stdalign.h", "stdbool.h", "iso646.h"})) {

static constexpr StringRef HeadersToDelete[] = {"stdalign.h", "stdbool.h",
"iso646.h"};
for (const auto &Key : HeadersToDelete)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

DeleteHeaders.insert_range(HeadersToDelete);

or

DeleteHeaders = {{"stdalign.h", "stdbool.h", "iso646.h"}};

DeleteHeaders.insert(Key);
}
}

void IncludeModernizePPCallbacks::InclusionDirective(
Expand Down Expand Up @@ -205,7 +195,7 @@ void IncludeModernizePPCallbacks::InclusionDirective(
} else if (DeleteHeaders.contains(FileName)) {
IncludesToBeProcessed.emplace_back(
// NOLINTNEXTLINE(modernize-use-emplace) - false-positive
IncludeMarker{std::string{}, FileName,
IncludeMarker{StringRef{}, FileName,
SourceRange{HashLoc, FilenameRange.getEnd()}, DiagLoc});
}
}
Expand Down
2 changes: 1 addition & 1 deletion clang-tools-extra/clang-tidy/modernize/DeprecatedHeadersCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class DeprecatedHeadersCheck : public ClangTidyCheck {
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;

struct IncludeMarker {
std::string Replacement;
StringRef Replacement;
StringRef FileName;
SourceRange ReplacementRange;
SourceLocation DiagLoc;
Expand Down
Loading