Author: adrian
Date: Wed Mar 13 08:54:18 2019
New Revision: 356057
URL: http://llvm.org/viewvc/llvm-project?rev=356057&view=rev
Log:
Make sure FileSystem::Resolve preserves the path/file distinction.
This should finally fix TestPaths.py.
Modified:
lldb/trunk/source/Host/common/FileSystem.cpp
Modified: lldb/trunk/source/Host/common/FileSystem.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/FileSystem.cpp?rev=356057&r1=356056&r2=356057&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/FileSystem.cpp (original)
+++ lldb/trunk/source/Host/common/FileSystem.cpp Wed Mar 13 08:54:18 2019
@@ -264,7 +264,10 @@ void FileSystem::Resolve(FileSpec &file_
Resolve(path);
// Update the FileSpec with the resolved path.
- file_spec.SetPath(path);
+ if (file_spec.GetFilename().IsEmpty())
+ file_spec.GetDirectory().SetString(path);
+ else
+ file_spec.SetPath(path);
file_spec.SetIsResolved(true);
}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
