harlanhaskins created this revision. harlanhaskins added a reviewer: arphaman. Herald added subscribers: cfe-commits, dexonsmith. Herald added a project: clang. arphaman accepted this revision. arphaman added a comment. This revision is now accepted and ready to land. Herald added a subscriber: ormris.
LG Update this test to return std::error_code instead of LookupResult. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D60786 Files: clang/unittests/Basic/FileManagerTest.cpp Index: clang/unittests/Basic/FileManagerTest.cpp =================================================================== --- clang/unittests/Basic/FileManagerTest.cpp +++ clang/unittests/Basic/FileManagerTest.cpp @@ -57,9 +57,10 @@ } // Implement FileSystemStatCache::getStat(). - LookupResult getStat(StringRef Path, llvm::vfs::Status &Status, bool isFile, - std::unique_ptr<llvm::vfs::File> *F, - llvm::vfs::FileSystem &FS) override { + std::error_code getStat(StringRef Path, llvm::vfs::Status &Status, + bool isFile, + std::unique_ptr<llvm::vfs::File> *F, + llvm::vfs::FileSystem &FS) override { #ifndef _WIN32 SmallString<128> NormalizedPath(Path); llvm::sys::path::native(NormalizedPath); @@ -68,10 +69,10 @@ if (StatCalls.count(Path) != 0) { Status = StatCalls[Path]; - return CacheExists; + return std::error_code(); } - return CacheMissing; // This means the file/directory doesn't exist. + return std::make_error_code(std::errc::no_such_file_or_directory); } };
Index: clang/unittests/Basic/FileManagerTest.cpp =================================================================== --- clang/unittests/Basic/FileManagerTest.cpp +++ clang/unittests/Basic/FileManagerTest.cpp @@ -57,9 +57,10 @@ } // Implement FileSystemStatCache::getStat(). - LookupResult getStat(StringRef Path, llvm::vfs::Status &Status, bool isFile, - std::unique_ptr<llvm::vfs::File> *F, - llvm::vfs::FileSystem &FS) override { + std::error_code getStat(StringRef Path, llvm::vfs::Status &Status, + bool isFile, + std::unique_ptr<llvm::vfs::File> *F, + llvm::vfs::FileSystem &FS) override { #ifndef _WIN32 SmallString<128> NormalizedPath(Path); llvm::sys::path::native(NormalizedPath); @@ -68,10 +69,10 @@ if (StatCalls.count(Path) != 0) { Status = StatCalls[Path]; - return CacheExists; + return std::error_code(); } - return CacheMissing; // This means the file/directory doesn't exist. + return std::make_error_code(std::errc::no_such_file_or_directory); } };
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits