Author: Jan Svoboda Date: 2022-04-20T20:27:13+02:00 New Revision: 99cfccdcb371cd6769169538098c3c3539cf9498
URL: https://github.com/llvm/llvm-project/commit/99cfccdcb371cd6769169538098c3c3539cf9498 DIFF: https://github.com/llvm/llvm-project/commit/99cfccdcb371cd6769169538098c3c3539cf9498.diff LOG: [clang][lex] NFCI: Use FileEntryRef in ModuleMap::diagnoseHeaderInclusion() This patch removes uses of the deprecated `DirectoryEntry::getName()` from the `ModuleMap::diagnoseHeaderInclusion()` function by using `{File,Directory}EntryRef` instead. Reviewed By: bnbarham Differential Revision: https://reviews.llvm.org/D123856 Added: Modified: clang/include/clang/Lex/ModuleMap.h clang/lib/Lex/ModuleMap.cpp clang/lib/Lex/PPDirectives.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Lex/ModuleMap.h b/clang/include/clang/Lex/ModuleMap.h index 3e14009d1027a..20da9eb18a3e2 100644 --- a/clang/include/clang/Lex/ModuleMap.h +++ b/clang/include/clang/Lex/ModuleMap.h @@ -479,7 +479,7 @@ class ModuleMap { void diagnoseHeaderInclusion(Module *RequestingModule, bool RequestingModuleIsModuleInterface, SourceLocation FilenameLoc, StringRef Filename, - const FileEntry *File); + FileEntryRef File); /// Determine whether the given header is part of a module /// marked 'unavailable'. diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp index 75a0e6bcdfe68..c791e3e4e5ca9 100644 --- a/clang/lib/Lex/ModuleMap.cpp +++ b/clang/lib/Lex/ModuleMap.cpp @@ -473,8 +473,7 @@ static Module *getTopLevelOrNull(Module *M) { void ModuleMap::diagnoseHeaderInclusion(Module *RequestingModule, bool RequestingModuleIsModuleInterface, SourceLocation FilenameLoc, - StringRef Filename, - const FileEntry *File) { + StringRef Filename, FileEntryRef File) { // No errors for indirect modules. This may be a bit of a problem for modules // with no source files. if (getTopLevelOrNull(RequestingModule) != getTopLevelOrNull(SourceModule)) @@ -542,7 +541,7 @@ void ModuleMap::diagnoseHeaderInclusion(Module *RequestingModule, diag::warn_non_modular_include_in_framework_module : diag::warn_non_modular_include_in_module; Diags.Report(FilenameLoc, DiagID) << RequestingModule->getFullModuleName() - << File->getName(); + << File.getName(); } } diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp index fbc9466e887f1..0ac3bec5148ab 100644 --- a/clang/lib/Lex/PPDirectives.cpp +++ b/clang/lib/Lex/PPDirectives.cpp @@ -905,7 +905,7 @@ Optional<FileEntryRef> Preprocessor::LookupFile( if (SuggestedModule && !LangOpts.AsmPreprocessor) HeaderInfo.getModuleMap().diagnoseHeaderInclusion( RequestingModule, RequestingModuleIsModuleInterface, FilenameLoc, - Filename, &FE->getFileEntry()); + Filename, *FE); return FE; } @@ -921,7 +921,7 @@ Optional<FileEntryRef> Preprocessor::LookupFile( if (SuggestedModule && !LangOpts.AsmPreprocessor) HeaderInfo.getModuleMap().diagnoseHeaderInclusion( RequestingModule, RequestingModuleIsModuleInterface, FilenameLoc, - Filename, &FE->getFileEntry()); + Filename, *FE); return FE; } } @@ -936,7 +936,7 @@ Optional<FileEntryRef> Preprocessor::LookupFile( if (SuggestedModule && !LangOpts.AsmPreprocessor) HeaderInfo.getModuleMap().diagnoseHeaderInclusion( RequestingModule, RequestingModuleIsModuleInterface, - FilenameLoc, Filename, &FE->getFileEntry()); + FilenameLoc, Filename, *FE); return FE; } } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
