Author: Jan Svoboda Date: 2023-09-08T21:28:05-07:00 New Revision: 358d9dbf4f1b9b3b166139a366d0e8c5162988c0
URL: https://github.com/llvm/llvm-project/commit/358d9dbf4f1b9b3b166139a366d0e8c5162988c0 DIFF: https://github.com/llvm/llvm-project/commit/358d9dbf4f1b9b3b166139a366d0e8c5162988c0.diff LOG: [clang] NFCI: Use `FileEntryRef` in `checkMSVCHeaderSearch()` Added: Modified: clang/lib/Lex/HeaderSearch.cpp Removed: ################################################################################ diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp index 798a249b4ffa5f9..f5f4bbf85fa92c2 100644 --- a/clang/lib/Lex/HeaderSearch.cpp +++ b/clang/lib/Lex/HeaderSearch.cpp @@ -756,9 +756,10 @@ void HeaderSearch::setTarget(const TargetInfo &Target) { /// fails to match the one that Clang would have found with MSVC header search /// disabled. static bool checkMSVCHeaderSearch(DiagnosticsEngine &Diags, - const FileEntry *MSFE, const FileEntry *FE, + OptionalFileEntryRef MSFE, + const FileEntry *FE, SourceLocation IncludeLoc) { - if (MSFE && FE != MSFE) { + if (MSFE && FE != *MSFE) { Diags.Report(IncludeLoc, diag::ext_pp_include_search_ms) << MSFE->getName(); return true; } @@ -1110,8 +1111,7 @@ OptionalFileEntryRef HeaderSearch::LookupFile( getUniqueFrameworkName(StringRef(Filename.begin(), SlashPos)); } - if (checkMSVCHeaderSearch(Diags, MSFE ? &MSFE->getFileEntry() : nullptr, - &File->getFileEntry(), IncludeLoc)) { + if (checkMSVCHeaderSearch(Diags, MSFE, &File->getFileEntry(), IncludeLoc)) { if (SuggestedModule) *SuggestedModule = MSSuggestedModule; return MSFE; @@ -1146,7 +1146,7 @@ OptionalFileEntryRef HeaderSearch::LookupFile( Includers.front(), SearchPath, RelativePath, RequestingModule, SuggestedModule, IsMapped, /*IsFrameworkFound=*/nullptr); - if (checkMSVCHeaderSearch(Diags, MSFE ? &MSFE->getFileEntry() : nullptr, + if (checkMSVCHeaderSearch(Diags, MSFE, File ? &File->getFileEntry() : nullptr, IncludeLoc)) { if (SuggestedModule) @@ -1161,8 +1161,7 @@ OptionalFileEntryRef HeaderSearch::LookupFile( } } - if (checkMSVCHeaderSearch(Diags, MSFE ? &MSFE->getFileEntry() : nullptr, - nullptr, IncludeLoc)) { + if (checkMSVCHeaderSearch(Diags, MSFE, nullptr, IncludeLoc)) { if (SuggestedModule) *SuggestedModule = MSSuggestedModule; return MSFE; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits