From d6039e045ff2323428debd9419770e369b89e5b8 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 8 Aug 2014 21:35:52 +0000 Subject: [PATCH] Remove dead code. Fixes pr20544. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@215243 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/FileSystem.h | 8 -------- lib/Support/Unix/Path.inc | 13 ------------- lib/Support/Windows/Path.inc | 5 ----- unittests/Support/Path.cpp | 12 ++++++------ 4 files changed, 6 insertions(+), 32 deletions(-) diff --git a/include/llvm/Support/FileSystem.h b/include/llvm/Support/FileSystem.h index 556701c3ba3..fd68d8741fd 100644 --- a/include/llvm/Support/FileSystem.h +++ b/include/llvm/Support/FileSystem.h @@ -276,14 +276,6 @@ private: /// platform-specific error_code. std::error_code make_absolute(SmallVectorImpl &path); -/// @brief Normalize path separators in \a Path -/// -/// If the path contains any '\' separators, they are transformed into '/'. -/// This is particularly useful when cross-compiling Windows on Linux, but is -/// safe to invoke on Windows, which accepts both characters as a path -/// separator. -std::error_code normalize_separators(SmallVectorImpl &Path); - /// @brief Create all the non-existent directories in path. /// /// @param path Directories to create. diff --git a/lib/Support/Unix/Path.inc b/lib/Support/Unix/Path.inc index 623547a95ed..64ea23c0689 100644 --- a/lib/Support/Unix/Path.inc +++ b/lib/Support/Unix/Path.inc @@ -272,19 +272,6 @@ std::error_code create_directory(const Twine &path, bool IgnoreExisting) { return std::error_code(); } -std::error_code normalize_separators(SmallVectorImpl &Path) { - for (auto PI = Path.begin(), PE = Path.end(); PI < PE; ++PI) { - if (*PI == '\\') { - auto PN = PI + 1; - if (PN < PE && *PN == '\\') - ++PI; // increment once, the for loop will move over the escaped slash - else - *PI = '/'; - } - } - return std::error_code(); -} - // Note that we are using symbolic link because hard links are not supported by // all filesystems (SMB doesn't). std::error_code create_link(const Twine &to, const Twine &from) { diff --git a/lib/Support/Windows/Path.inc b/lib/Support/Windows/Path.inc index 7a1bc0447fa..a57f252fbfc 100644 --- a/lib/Support/Windows/Path.inc +++ b/lib/Support/Windows/Path.inc @@ -163,11 +163,6 @@ std::error_code create_directory(const Twine &path, bool IgnoreExisting) { return std::error_code(); } -std::error_code normalize_separators(SmallVectorImpl &Path) { - (void) Path; - return std::error_code(); -} - // We can't use symbolic links for windows. std::error_code create_link(const Twine &to, const Twine &from) { // Get arguments. diff --git a/unittests/Support/Path.cpp b/unittests/Support/Path.cpp index bb1428f4de4..9c156401927 100644 --- a/unittests/Support/Path.cpp +++ b/unittests/Support/Path.cpp @@ -640,22 +640,22 @@ TEST(Support, NormalizePath) { SmallString<64> Path5("\\a"); SmallString<64> Path6("a\\"); - ASSERT_NO_ERROR(fs::normalize_separators(Path1)); + path::native(Path1); EXPECT_PATH_IS(Path1, "a", "a"); - ASSERT_NO_ERROR(fs::normalize_separators(Path2)); + path::native(Path2); EXPECT_PATH_IS(Path2, "a/b", "a/b"); - ASSERT_NO_ERROR(fs::normalize_separators(Path3)); + path::native(Path3); EXPECT_PATH_IS(Path3, "a\\b", "a/b"); - ASSERT_NO_ERROR(fs::normalize_separators(Path4)); + path::native(Path4); EXPECT_PATH_IS(Path4, "a\\\\b", "a\\\\b"); - ASSERT_NO_ERROR(fs::normalize_separators(Path5)); + path::native(Path5); EXPECT_PATH_IS(Path5, "\\a", "/a"); - ASSERT_NO_ERROR(fs::normalize_separators(Path6)); + path::native(Path6); EXPECT_PATH_IS(Path6, "a\\", "a/"); #undef EXPECT_PATH_IS -- 2.34.1