diff --git a/clang/unittests/Basic/FileManagerTest.cpp b/clang/unittests/Basic/FileManagerTest.cpp --- a/clang/unittests/Basic/FileManagerTest.cpp +++ b/clang/unittests/Basic/FileManagerTest.cpp @@ -411,7 +411,7 @@ #endif // !_WIN32 static StringRef getSystemRoot() { - return is_style_windows(llvm::sys::path::Style::native) ? "C:/" : "/"; + return is_style_windows(llvm::sys::path::Style::native) ? "C:\\" : "/"; } TEST_F(FileManagerTest, makeAbsoluteUsesVFS) { diff --git a/clang/unittests/Frontend/PCHPreambleTest.cpp b/clang/unittests/Frontend/PCHPreambleTest.cpp --- a/clang/unittests/Frontend/PCHPreambleTest.cpp +++ b/clang/unittests/Frontend/PCHPreambleTest.cpp @@ -24,6 +24,13 @@ namespace { +std::string Canonicalize(const Twine &Path) { + SmallVector PathVec; + Path.toVector(PathVec); + llvm::sys::path::remove_dots(PathVec, true); + return std::string(PathVec.begin(), PathVec.end()); +} + class ReadCountingInMemoryFileSystem : public vfs::InMemoryFileSystem { std::map ReadCounts; @@ -31,16 +38,13 @@ public: ErrorOr> openFileForRead(const Twine &Path) override { - SmallVector PathVec; - Path.toVector(PathVec); - llvm::sys::path::remove_dots(PathVec, true); - ++ReadCounts[std::string(PathVec.begin(), PathVec.end())]; + ++ReadCounts[Canonicalize(Path)]; return InMemoryFileSystem::openFileForRead(Path); } unsigned GetReadCount(const Twine &Path) const { - auto it = ReadCounts.find(Path.str()); + auto it = ReadCounts.find(Canonicalize(Path)); return it == ReadCounts.end() ? 0 : it->second; } }; diff --git a/llvm/lib/Support/Path.cpp b/llvm/lib/Support/Path.cpp --- a/llvm/lib/Support/Path.cpp +++ b/llvm/lib/Support/Path.cpp @@ -760,11 +760,15 @@ } } + SmallString<256> buffer = root; + // "root" could be "/", which may need to be translated into "\". + make_preferred(buffer, style); + needs_change |= root != buffer; + // Avoid rewriting the path unless we have to. if (!needs_change) return false; - SmallString<256> buffer = root; if (!components.empty()) { buffer += components[0]; for (StringRef C : makeArrayRef(components).drop_front()) { diff --git a/llvm/unittests/Support/Path.cpp b/llvm/unittests/Support/Path.cpp --- a/llvm/unittests/Support/Path.cpp +++ b/llvm/unittests/Support/Path.cpp @@ -1544,16 +1544,14 @@ EXPECT_EQ("C:\\a\\c", remove_dots("C:\\foo\\bar//..\\..\\a\\c", true, path::Style::windows)); - // FIXME: These leading forward slashes are emergent behavior. VFS depends on - // this behavior now. - EXPECT_EQ("C:/bar", + EXPECT_EQ("C:\\bar", remove_dots("C:/foo/../bar", true, path::Style::windows)); - EXPECT_EQ("C:/foo\\bar", + EXPECT_EQ("C:\\foo\\bar", remove_dots("C:/foo/bar", true, path::Style::windows)); - EXPECT_EQ("C:/foo\\bar", + EXPECT_EQ("C:\\foo\\bar", remove_dots("C:/foo\\bar", true, path::Style::windows)); - EXPECT_EQ("/", remove_dots("/", true, path::Style::windows)); - EXPECT_EQ("C:/", remove_dots("C:/", true, path::Style::windows)); + EXPECT_EQ("\\", remove_dots("/", true, path::Style::windows)); + EXPECT_EQ("C:\\", remove_dots("C:/", true, path::Style::windows)); // Some clients of remove_dots expect it to remove trailing slashes. Again, // this is emergent behavior that VFS relies on, and not inherently part of @@ -1564,7 +1562,8 @@ remove_dots("/foo/bar/", true, path::Style::posix)); // A double separator is rewritten. - EXPECT_EQ("C:/foo\\bar", remove_dots("C:/foo//bar", true, path::Style::windows)); + EXPECT_EQ("C:\\foo\\bar", + remove_dots("C:/foo//bar", true, path::Style::windows)); SmallString<64> Path1(".\\.\\c"); EXPECT_TRUE(path::remove_dots(Path1, true, path::Style::windows)); diff --git a/llvm/unittests/Support/VirtualFileSystemTest.cpp b/llvm/unittests/Support/VirtualFileSystemTest.cpp --- a/llvm/unittests/Support/VirtualFileSystemTest.cpp +++ b/llvm/unittests/Support/VirtualFileSystemTest.cpp @@ -923,11 +923,11 @@ auto PWD = PFS.getCurrentWorkingDirectory(); ASSERT_FALSE(PWD.getError()); - ASSERT_EQ("/", *PWD); + ASSERT_EQ("/", getPosixPath(*PWD)); SmallString<16> Path; ASSERT_FALSE(PFS.getRealPath("a", Path)); - ASSERT_EQ("/a", Path); + ASSERT_EQ("/a", getPosixPath(Path)); bool Local = true; ASSERT_FALSE(PFS.isLocal("/a", Local)); @@ -1343,7 +1343,8 @@ EXPECT_NE(FS.status("/a")->getUniqueID(), FS.status("/e")->getUniqueID()); // Recreating the "same" FS yields the same UniqueIDs. - vfs::InMemoryFileSystem FS2; + // Note: FS2 should match FS with respect to path normalization. + vfs::InMemoryFileSystem FS2(/*UseNormalizedPath=*/false); ASSERT_TRUE(FS2.addFile("/a/b", 0, MemoryBuffer::getMemBuffer("text"))); EXPECT_EQ(FS.status("/a/b")->getUniqueID(), FS2.status("/a/b")->getUniqueID());