summaryrefslogtreecommitdiffstats
path: root/lldb/source/Host/common/FileSystem.cpp
diff options
context:
space:
mode:
authorJonas Devlieghere <jonas@devlieghere.com>2018-11-09 01:59:28 +0000
committerJonas Devlieghere <jonas@devlieghere.com>2018-11-09 01:59:28 +0000
commit72787ac661626c6972bf028dfb9b3615a89346ea (patch)
treec120717f89bb2740bbc17b1f840ec1413eca1c29 /lldb/source/Host/common/FileSystem.cpp
parent2faf079494e90c1a941cf1bf51c8e7abb19bcef9 (diff)
downloadbcm5719-llvm-72787ac661626c6972bf028dfb9b3615a89346ea.tar.gz
bcm5719-llvm-72787ac661626c6972bf028dfb9b3615a89346ea.zip
Revert "[FileSystem] Make use of FS in TildeExpressionResolver"
The whole point of this change was making it possible to resolve paths without depending on the FileSystem, which is not what I did here. Not sure what I was thinking... llvm-svn: 346466
Diffstat (limited to 'lldb/source/Host/common/FileSystem.cpp')
-rw-r--r--lldb/source/Host/common/FileSystem.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/lldb/source/Host/common/FileSystem.cpp b/lldb/source/Host/common/FileSystem.cpp
index c1f98c1ad65..a9ed5bd1847 100644
--- a/lldb/source/Host/common/FileSystem.cpp
+++ b/lldb/source/Host/common/FileSystem.cpp
@@ -183,9 +183,8 @@ std::error_code FileSystem::MakeAbsolute(FileSpec &file_spec) const {
}
std::error_code FileSystem::GetRealPath(const Twine &path,
- SmallVectorImpl<char> &output,
- bool expand_tilde) const {
- return m_fs->getRealPath(path, output, expand_tilde);
+ SmallVectorImpl<char> &output) const {
+ return m_fs->getRealPath(path, output);
}
void FileSystem::Resolve(SmallVectorImpl<char> &path) {
@@ -194,8 +193,8 @@ void FileSystem::Resolve(SmallVectorImpl<char> &path) {
// Resolve tilde.
SmallString<128> original_path(path.begin(), path.end());
- StandardTildeExpressionResolver resolver(*this);
- resolver.ResolveFullPath(original_path, path);
+ StandardTildeExpressionResolver Resolver;
+ Resolver.ResolveFullPath(original_path, path);
// Try making the path absolute if it exists.
SmallString<128> absolute_path(path.begin(), path.end());
OpenPOWER on IntegriCloud