maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lldb] Fix interpreting absolute Windows paths with forward slashes 

In practice, Windows paths can use either backslashes or forward slashes.

This fixes an issue reported downstream at
https://github.com/mstorsjo/llvm-mingw/issues/266.

Differential Revision: https://reviews.llvm.org/D122389
This commit is contained in:
Martin Storsjö 2022-03-24 10:42:37 +02:00
parent bc13101cf9
commit b548f58472
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lldb/source/Plugins/SymbolFile/DWARF/DWARFUnit.cpp
View File

@ -772,7 +772,8 @@ removeHostnameFromPathname(llvm::StringRef path_from_dwarf) {
// check whether we have a windows path, and so the first character is a
// drive-letter not a hostname.
if (host.size() == 1 && llvm::isAlpha(host[0]) && path.startswith("\\"))
if (host.size() == 1 && llvm::isAlpha(host[0]) &&
(path.startswith("\\") || path.startswith("/")))
return path_from_dwarf;
return path;

3
lldb/source/Utility/FileSpec.cpp
View File

@ -311,7 +311,8 @@ llvm::Optional<FileSpec::Style> FileSpec::GuessPathStyle(llvm::StringRef absolut
if (absolute_path.startswith(R"(\\)"))
return Style::windows;
if (absolute_path.size() >= 3 && llvm::isAlpha(absolute_path[0]) &&
absolute_path.substr(1, 2) == R"(:\)")
(absolute_path.substr(1, 2) == R"(:\)" ||
absolute_path.substr(1, 2) == R"(:/)"))
return Style::windows;
return llvm::None;
}

3
lldb/unittests/Utility/FileSpecTest.cpp
View File

@ -196,9 +196,12 @@ TEST(FileSpecTest, GuessPathStyle) {
EXPECT_EQ(FileSpec::Style::posix, FileSpec::GuessPathStyle("//net/bar.txt"));
EXPECT_EQ(FileSpec::Style::windows,
FileSpec::GuessPathStyle(R"(C:\foo.txt)"));
EXPECT_EQ(FileSpec::Style::windows,
FileSpec::GuessPathStyle(R"(C:/foo.txt)"));
EXPECT_EQ(FileSpec::Style::windows,
FileSpec::GuessPathStyle(R"(\\net\foo.txt)"));
EXPECT_EQ(FileSpec::Style::windows, FileSpec::GuessPathStyle(R"(Z:\)"));
EXPECT_EQ(FileSpec::Style::windows, FileSpec::GuessPathStyle(R"(Z:/)"));
EXPECT_EQ(llvm::None, FileSpec::GuessPathStyle("foo.txt"));
EXPECT_EQ(llvm::None, FileSpec::GuessPathStyle("foo/bar.txt"));
EXPECT_EQ(llvm::None, FileSpec::GuessPathStyle("Z:"));