From 72787ac661626c6972bf028dfb9b3615a89346ea Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Fri, 9 Nov 2018 01:59:28 +0000 Subject: 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 --- lldb/source/Utility/TildeExpressionResolver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lldb/source/Utility/TildeExpressionResolver.cpp') diff --git a/lldb/source/Utility/TildeExpressionResolver.cpp b/lldb/source/Utility/TildeExpressionResolver.cpp index 8f3d04f90f0..ae947059d8b 100644 --- a/lldb/source/Utility/TildeExpressionResolver.cpp +++ b/lldb/source/Utility/TildeExpressionResolver.cpp @@ -8,13 +8,13 @@ //===----------------------------------------------------------------------===// #include "lldb/Utility/TildeExpressionResolver.h" -#include "lldb/Host/FileSystem.h" #include // for assert #include // for error_code #include "llvm/ADT/STLExtras.h" // for any_of #include "llvm/ADT/SmallVector.h" // for SmallVectorImpl +#include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" #include "llvm/Support/raw_ostream.h" // for fs @@ -37,7 +37,7 @@ bool StandardTildeExpressionResolver::ResolveExact( assert(!llvm::any_of(Expr, [](char c) { return path::is_separator(c); })); assert(Expr.empty() || Expr[0] == '~'); - return !m_fs.GetRealPath(Expr, Output, true); + return !fs::real_path(Expr, Output, true); } bool StandardTildeExpressionResolver::ResolvePartial(StringRef Expr, -- cgit v1.2.3