Author: Jan Svoboda Date: 2025-03-20T09:38:19-07:00 New Revision: 99b1a2ac078fe52300d270b3e77ddbababa8f951
URL: https://github.com/llvm/llvm-project/commit/99b1a2ac078fe52300d270b3e77ddbababa8f951 DIFF: https://github.com/llvm/llvm-project/commit/99b1a2ac078fe52300d270b3e77ddbababa8f951.diff LOG: [clang] Remove deprecated `FileManager` APIs (#132063) This PR removes the `FileManager` APIs that have been deprecated for a while. LLVM 20.1.0 that was released earlier this month contains the formal deprecation of these APIs, so these should be fine to remove in the next major release. Added: Modified: clang/include/clang/Basic/FileManager.h clang/lib/Basic/FileManager.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Basic/FileManager.h b/clang/include/clang/Basic/FileManager.h index 6cc6c2bfd2b6b..e83a61d6ff00c 100644 --- a/clang/include/clang/Basic/FileManager.h +++ b/clang/include/clang/Basic/FileManager.h @@ -177,43 +177,6 @@ class FileManager : public RefCountedBase<FileManager> { return llvm::expectedToOptional(getDirectoryRef(DirName, CacheFailure)); } - /// Lookup, cache, and verify the specified directory (real or - /// virtual). - /// - /// This function is deprecated and will be removed at some point in the - /// future, new clients should use - /// \c getDirectoryRef. - /// - /// This returns a \c std::error_code if there was an error reading the - /// directory. If there is no error, the DirectoryEntry is guaranteed to be - /// non-NULL. - /// - /// \param CacheFailure If true and the file does not exist, we'll cache - /// the failure to find this file. - LLVM_DEPRECATED("Functions returning DirectoryEntry are deprecated.", - "getOptionalDirectoryRef()") - llvm::ErrorOr<const DirectoryEntry *> - getDirectory(StringRef DirName, bool CacheFailure = true); - - /// Lookup, cache, and verify the specified file (real or - /// virtual). - /// - /// This function is deprecated and will be removed at some point in the - /// future, new clients should use - /// \c getFileRef. - /// - /// This returns a \c std::error_code if there was an error loading the file. - /// If there is no error, the FileEntry is guaranteed to be non-NULL. - /// - /// \param OpenFile if true and the file exists, it will be opened. - /// - /// \param CacheFailure If true and the file does not exist, we'll cache - /// the failure to find this file. - LLVM_DEPRECATED("Functions returning FileEntry are deprecated.", - "getOptionalFileRef()") - llvm::ErrorOr<const FileEntry *> - getFile(StringRef Filename, bool OpenFile = false, bool CacheFailure = true); - /// Lookup, cache, and verify the specified file (real or virtual). Return the /// reference to the file entry together with the exact path that was used to /// access a file by a particular call to getFileRef. If the underlying VFS is diff --git a/clang/lib/Basic/FileManager.cpp b/clang/lib/Basic/FileManager.cpp index f0b6f7be6c84f..ec84aad72e6be 100644 --- a/clang/lib/Basic/FileManager.cpp +++ b/clang/lib/Basic/FileManager.cpp @@ -196,22 +196,6 @@ FileManager::getDirectoryRef(StringRef DirName, bool CacheFailure) { return DirectoryEntryRef(NamedDirEnt); } -llvm::ErrorOr<const DirectoryEntry *> -FileManager::getDirectory(StringRef DirName, bool CacheFailure) { - auto Result = getDirectoryRef(DirName, CacheFailure); - if (Result) - return &Result->getDirEntry(); - return llvm::errorToErrorCode(Result.takeError()); -} - -llvm::ErrorOr<const FileEntry *> -FileManager::getFile(StringRef Filename, bool openFile, bool CacheFailure) { - auto Result = getFileRef(Filename, openFile, CacheFailure); - if (Result) - return &Result->getFileEntry(); - return llvm::errorToErrorCode(Result.takeError()); -} - llvm::Expected<FileEntryRef> FileManager::getFileRef(StringRef Filename, bool openFile, bool CacheFailure, _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
