RPCS3/archived-llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2026-01-31 01:25:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[VFS] Add "expand tilde" argument to getRealPath."

Browse Source 
This reverts commit r346453.
This is a complex change to a widely-used interface, and was not reviewed.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@346500 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sam McCall
2018-11-09 15:11:34 +00:00
parent 72e06ac443
commit 1949578de3
3 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Support/VirtualFileSystem.cpp
View File

@@ -132,8 +132,7 @@ std::error_code FileSystem::makeAbsolute(SmallVectorImpl<char> &Path) const {
}
std::error_code FileSystem::getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output,
bool ExpandTilde) const {
SmallVectorImpl<char> &Output) const {
return errc::operation_not_permitted;
}
@@ -239,8 +238,8 @@ public:
llvm::ErrorOr<std::string> getCurrentWorkingDirectory() const override;
std::error_code setCurrentWorkingDirectory(const Twine &Path) override;
std::error_code isLocal(const Twine &Path, bool &Result) override;
std::error_code getRealPath(const Twine &Path, SmallVectorImpl<char> &Output,
bool ExpandTilde = false) const override;
std::error_code getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output) const override;
private:
mutable std::mutex CWDMutex;
@@ -298,9 +297,9 @@ std::error_code RealFileSystem::isLocal(const Twine &Path, bool &Result) {
return llvm::sys::fs::is_local(Path, Result);
}
std::error_code RealFileSystem::getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output,
bool ExpandTilde) const {
std::error_code
RealFileSystem::getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output) const {
return llvm::sys::fs::real_path(Path, Output);
}
@@ -394,12 +393,12 @@ std::error_code OverlayFileSystem::isLocal(const Twine &Path, bool &Result) {
return errc::no_such_file_or_directory;
}
std::error_code OverlayFileSystem::getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output,
bool ExpandTilde) const {
std::error_code
OverlayFileSystem::getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output) const {
for (auto &FS : FSList)
if (FS->exists(Path))
return FS->getRealPath(Path, Output, ExpandTilde);
return FS->getRealPath(Path, Output);
return errc::no_such_file_or_directory;
}
@@ -917,9 +916,9 @@ std::error_code InMemoryFileSystem::setCurrentWorkingDirectory(const Twine &P) {
return {};
}
std::error_code InMemoryFileSystem::getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output,
bool ExpandTilde) const {
std::error_code
InMemoryFileSystem::getRealPath(const Twine &Path,
SmallVectorImpl<char> &Output) const {
auto CWD = getCurrentWorkingDirectory();
if (!CWD || CWD->empty())
return errc::operation_not_permitted;