From: Jordan Rupprecht Date: Tue, 24 Jul 2018 20:28:07 +0000 (+0000) Subject: Revert "[VFS] Cleanups to VFS interfaces." X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cedfdc027d4dc59b704d43b837c6d16ac282cf2;p=clang Revert "[VFS] Cleanups to VFS interfaces." This reverts commit r337834 due to test failures. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@337850 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Basic/VirtualFileSystem.h b/include/clang/Basic/VirtualFileSystem.h index bd752c8dad..2480b91123 100644 --- a/include/clang/Basic/VirtualFileSystem.h +++ b/include/clang/Basic/VirtualFileSystem.h @@ -45,8 +45,7 @@ class MemoryBuffer; namespace clang { namespace vfs { -/// File information from a \p File::status() operation. -/// This is roughly equivalent to a `struct stat` plus a file path. +/// The result of a \p status operation. class Status { std::string Name; llvm::sys::fs::UniqueID UID; @@ -67,14 +66,13 @@ public: llvm::sys::TimePoint<> MTime, uint32_t User, uint32_t Group, uint64_t Size, llvm::sys::fs::file_type Type, llvm::sys::fs::perms Perms); - Status(const llvm::sys::fs::file_status &FSStatus, StringRef Name); - /// Get a copy of a this Status with a different name. - Status copyWithNewName(StringRef NewName); + /// Get a copy of a Status with a different name. + static Status copyWithNewName(const Status &In, StringRef NewName); + static Status copyWithNewName(const llvm::sys::fs::file_status &In, + StringRef NewName); /// Returns the name that should be used for this file or directory. - /// This is usually the path that the file was opened as, without resolving - /// relative paths or symlinks. StringRef getName() const { return Name; } /// @name Status interface from llvm::sys::fs @@ -109,16 +107,15 @@ public: virtual ~File(); /// Get the status of the file. - /// This may access the filesystem (e.g. `stat()`), or return a cached value. virtual llvm::ErrorOr status() = 0; - /// Get the "real name" of the file, if available. - /// This should be absolute, and typically has symlinks resolved. - /// - /// Only some VFS implementations provide this, and only sometimes. - /// FIXME: these maybe-available semantics are not very useful. It would be - /// nice if this was more consistent with FileSystem::getRealPath(). - virtual llvm::Optional getRealPath() { return llvm::None; } + /// Get the name of the file + virtual llvm::ErrorOr getName() { + if (auto Status = status()) + return Status->getName().str(); + else + return Status.getError(); + } /// Get the contents of the file as a \p MemoryBuffer. virtual llvm::ErrorOr> diff --git a/lib/Basic/FileManager.cpp b/lib/Basic/FileManager.cpp index 13a3d8f95c..7e2d01c498 100644 --- a/lib/Basic/FileManager.cpp +++ b/lib/Basic/FileManager.cpp @@ -316,7 +316,7 @@ const FileEntry *FileManager::getFile(StringRef Filename, bool openFile, UFE.File = std::move(F); UFE.IsValid = true; if (UFE.File) - if (auto RealPathName = UFE.File->getRealPath()) + if (auto RealPathName = UFE.File->getName()) UFE.RealPathName = *RealPathName; return &UFE; } diff --git a/lib/Basic/VirtualFileSystem.cpp b/lib/Basic/VirtualFileSystem.cpp index b269a9fcc0..bcfcbdbb90 100644 --- a/lib/Basic/VirtualFileSystem.cpp +++ b/lib/Basic/VirtualFileSystem.cpp @@ -73,14 +73,16 @@ Status::Status(StringRef Name, UniqueID UID, sys::TimePoint<> MTime, : Name(Name), UID(UID), MTime(MTime), User(User), Group(Group), Size(Size), Type(Type), Perms(Perms) {} -Status::Status(const file_status &In, StringRef NewName) - : Status(NewName, In.getUniqueID(), In.getLastModificationTime(), - In.getUser(), In.getGroup(), In.getSize(), In.type(), - In.permissions()) {} +Status Status::copyWithNewName(const Status &In, StringRef NewName) { + return Status(NewName, In.getUniqueID(), In.getLastModificationTime(), + In.getUser(), In.getGroup(), In.getSize(), In.getType(), + In.getPermissions()); +} -Status Status::copyWithNewName(StringRef NewName) { - return Status(NewName, getUniqueID(), getLastModificationTime(), getUser(), - getGroup(), getSize(), getType(), getPermissions()); +Status Status::copyWithNewName(const file_status &In, StringRef NewName) { + return Status(NewName, In.getUniqueID(), In.getLastModificationTime(), + In.getUser(), In.getGroup(), In.getSize(), In.type(), + In.permissions()); } bool Status::equivalent(const Status &Other) const { @@ -176,7 +178,6 @@ class RealFile : public File { Status S; std::string RealName; - // NewRealPathName is used only if non-empty. RealFile(int FD, StringRef NewName, StringRef NewRealPathName) : FD(FD), S(NewName, {}, {}, {}, {}, {}, llvm::sys::fs::file_type::status_error, {}), @@ -188,7 +189,7 @@ public: ~RealFile() override; ErrorOr status() override; - Optional getRealPath() override; + ErrorOr getName() override; ErrorOr> getBuffer(const Twine &Name, int64_t FileSize, bool RequiresNullTerminator, @@ -206,15 +207,13 @@ ErrorOr RealFile::status() { file_status RealStatus; if (std::error_code EC = sys::fs::status(FD, RealStatus)) return EC; - S = Status(RealStatus, S.getName()); + S = Status::copyWithNewName(RealStatus, S.getName()); } return S; } -Optional RealFile::getRealPath() { - if (RealName.empty()) - return llvm::None; - return RealName; +ErrorOr RealFile::getName() { + return RealName.empty() ? S.getName().str() : RealName; } ErrorOr> @@ -252,7 +251,7 @@ ErrorOr RealFileSystem::status(const Twine &Path) { sys::fs::file_status RealStatus; if (std::error_code EC = sys::fs::status(Path, RealStatus)) return EC; - return Status(RealStatus, Path.str()); + return Status::copyWithNewName(RealStatus, Path.str()); } ErrorOr> @@ -304,7 +303,7 @@ public: if (Iter != llvm::sys::fs::directory_iterator()) { llvm::sys::fs::file_status S; std::error_code ErrorCode = llvm::sys::fs::status(Iter->path(), S, true); - CurrentEntry = Status(S, Iter->path()); + CurrentEntry = Status::copyWithNewName(S, Iter->path()); if (!EC) EC = ErrorCode; } @@ -318,7 +317,7 @@ public: } else { llvm::sys::fs::file_status S; std::error_code ErrorCode = llvm::sys::fs::status(Iter->path(), S, true); - CurrentEntry = Status(S, Iter->path()); + CurrentEntry = Status::copyWithNewName(S, Iter->path()); if (!EC) EC = ErrorCode; } @@ -1642,7 +1641,7 @@ static Status getRedirectedFileStatus(const Twine &Path, bool UseExternalNames, Status ExternalStatus) { Status S = ExternalStatus; if (!UseExternalNames) - S = S.copyWithNewName(Path.str()); + S = Status::copyWithNewName(S, Path.str()); S.IsVFSMapped = true; return S; } @@ -1658,7 +1657,7 @@ ErrorOr RedirectingFileSystem::status(const Twine &Path, Entry *E) { return S; } else { // directory auto *DE = cast(E); - return DE->getStatus().copyWithNewName(Path.str()); + return Status::copyWithNewName(DE->getStatus(), Path.str()); } }