Skip to content

Commit 923e57e

Browse files
committed
fix nits
1 parent 8765436 commit 923e57e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

clang/docs/ReleaseNotes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ Improvements to Clang's diagnostics
405405
attributes are used with a negative size (#GH165463).
406406

407407
- A new warning ``-Wshadow-header`` has been added to detect when a header file
408-
included via quotes (#include "...") is found in multiple distinct search directories.
408+
is found in multiple search directories(excluding system paths).
409409

410410
Improvements to Clang's time-trace
411411
----------------------------------

clang/include/clang/Lex/HeaderSearch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ class HeaderSearch {
465465
ExternalSource = ES;
466466
}
467467

468-
void DiagnoseHeaderShadowing(
468+
void diagnoseHeaderShadowing(
469469
StringRef Filename, OptionalFileEntryRef FE, bool &DiagnosedShadowing,
470470
SourceLocation IncludeLoc, ConstSearchDirIterator FromDir,
471471
ArrayRef<std::pair<OptionalFileEntryRef, DirectoryEntryRef>> Includers,

clang/lib/Lex/HeaderSearch.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ diagnoseFrameworkInclude(DiagnosticsEngine &Diags, SourceLocation IncludeLoc,
881881
<< IncludeFilename;
882882
}
883883

884-
void HeaderSearch::DiagnoseHeaderShadowing(
884+
void HeaderSearch::diagnoseHeaderShadowing(
885885
StringRef Filename, OptionalFileEntryRef FE, bool &DiagnosedShadowing,
886886
SourceLocation IncludeLoc, ConstSearchDirIterator FromDir,
887887
ArrayRef<std::pair<OptionalFileEntryRef, DirectoryEntryRef>> Includers,
@@ -1024,7 +1024,7 @@ OptionalFileEntryRef HeaderSearch::LookupFile(
10241024
if (OptionalFileEntryRef FE = getFileAndSuggestModule(
10251025
TmpDir, IncludeLoc, IncluderAndDir.second, IncluderIsSystemHeader,
10261026
RequestingModule, SuggestedModule)) {
1027-
DiagnoseHeaderShadowing(Filename, FE, DiagnosedShadowing, IncludeLoc,
1027+
diagnoseHeaderShadowing(Filename, FE, DiagnosedShadowing, IncludeLoc,
10281028
FromDir, Includers, isAngled,
10291029
&IncluderAndDir - Includers.begin(), nullptr);
10301030
if (!Includer) {
@@ -1161,7 +1161,7 @@ OptionalFileEntryRef HeaderSearch::LookupFile(
11611161
if (!File)
11621162
continue;
11631163

1164-
DiagnoseHeaderShadowing(Filename, File, DiagnosedShadowing, IncludeLoc,
1164+
diagnoseHeaderShadowing(Filename, File, DiagnosedShadowing, IncludeLoc,
11651165
FromDir, Includers, isAngled, -1, It);
11661166

11671167
CurDir = It;

0 commit comments

Comments
 (0)