replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Path] Fix bug in make_absolute logic 

This fixes a bug for making path with a //net style root absolute. I
discovered the bug while writing a test case for the VFS, which uses
these paths because they're both legal absolute paths on Windows and
Unix.

Differential revision: https://reviews.llvm.org/D65675

llvm-svn: 368053
This commit is contained in:
Jonas Devlieghere 2019-08-06 15:46:45 +00:00
parent 4b03364d72
commit cb6f2646fd
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/Support/Path.cpp
View File

@ -855,11 +855,11 @@ void make_absolute(const Twine &current_directory,
StringRef p(path.data(), path.size());
bool rootDirectory = path::has_root_directory(p);
bool rootName =
(real_style(Style::native) != Style::windows) || path::has_root_name(p);
bool rootName = path::has_root_name(p);
// Already absolute.
if (rootName && rootDirectory)
if ((rootName || real_style(Style::native) != Style::windows) &&
rootDirectory)
return;
// All of the following conditions will need the current directory.

17
llvm/unittests/Support/Path.cpp
View File

@ -185,10 +185,19 @@ TEST(Support, Path) {
path::native(*i, temp_store);
}
SmallString<32> Relative("foo.cpp");
sys::fs::make_absolute("/root", Relative);
Relative[5] = '/'; // Fix up windows paths.
ASSERT_EQ("/root/foo.cpp", Relative);
{
SmallString<32> Relative("foo.cpp");
sys::fs::make_absolute("/root", Relative);
Relative[5] = '/'; // Fix up windows paths.
ASSERT_EQ("/root/foo.cpp", Relative);
}
{
SmallString<32> Relative("foo.cpp");
sys::fs::make_absolute("//root", Relative);
Relative[6] = '/'; // Fix up windows paths.
ASSERT_EQ("//root/foo.cpp", Relative);
}
}
TEST(Support, FilenameParent) {