diff options
| author | Jan Svoboda <jan_svoboda@apple.com> | 2023-09-08 21:37:04 -0700 |
|---|---|---|
| committer | Jan Svoboda <jan_svoboda@apple.com> | 2023-09-09 09:12:35 -0700 |
| commit | ef996175a7d38f7b4a0b60264dc861ab36376a47 (patch) | |
| tree | 647dd9c4e9e118c3bddeb253018c2016654a97aa /clang | |
| parent | 119c489cc1a026feafe67c2b58c34b40dc2b6bd0 (diff) | |
| download | llvm-ef996175a7d38f7b4a0b60264dc861ab36376a47.zip llvm-ef996175a7d38f7b4a0b60264dc861ab36376a47.tar.gz llvm-ef996175a7d38f7b4a0b60264dc861ab36376a47.tar.bz2 | |
[clang] NFCI: Use `FileEntryRef` in `diagnoseFrameworkInclude()`
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Lex/HeaderSearch.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp index f5f4bbf8..ec7cb58 100644 --- a/clang/lib/Lex/HeaderSearch.cpp +++ b/clang/lib/Lex/HeaderSearch.cpp @@ -818,7 +818,7 @@ static bool isFrameworkStylePath(StringRef Path, bool &IsPrivateHeader, static void diagnoseFrameworkInclude(DiagnosticsEngine &Diags, SourceLocation IncludeLoc, StringRef Includer, StringRef IncludeFilename, - const FileEntry *IncludeFE, bool isAngled = false, + FileEntryRef IncludeFE, bool isAngled = false, bool FoundByHeaderMap = false) { bool IsIncluderPrivateHeader = false; SmallString<128> FromFramework, ToFramework; @@ -828,7 +828,7 @@ diagnoseFrameworkInclude(DiagnosticsEngine &Diags, SourceLocation IncludeLoc, return; bool IsIncludeePrivateHeader = false; bool IsIncludeeInFramework = - isFrameworkStylePath(IncludeFE->getName(), IsIncludeePrivateHeader, + isFrameworkStylePath(IncludeFE.getName(), IsIncludeePrivateHeader, ToFramework, ToIncludeSpelling); if (!isAngled && !FoundByHeaderMap) { @@ -965,7 +965,7 @@ OptionalFileEntryRef HeaderSearch::LookupFile( if (First) { diagnoseFrameworkInclude(Diags, IncludeLoc, IncluderAndDir.second.getName(), Filename, - &FE->getFileEntry()); + *FE); return FE; } @@ -1119,9 +1119,9 @@ OptionalFileEntryRef HeaderSearch::LookupFile( bool FoundByHeaderMap = !IsMapped ? false : *IsMapped; if (!Includers.empty()) - diagnoseFrameworkInclude( - Diags, IncludeLoc, Includers.front().second.getName(), Filename, - &File->getFileEntry(), isAngled, FoundByHeaderMap); + diagnoseFrameworkInclude(Diags, IncludeLoc, + Includers.front().second.getName(), Filename, + *File, isAngled, FoundByHeaderMap); // Remember this location for the next lookup we do. cacheLookupSuccess(CacheLookup, It, IncludeLoc); |