Support/PathV2: Add remove_filename implementation.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120513 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/PathV2.h b/include/llvm/Support/PathV2.h
index e1b0a1d0e369194b3d987421364e4d92b86d7e3b..c3feca7acc5d1e2400eb4401e0810a662e56abf4 100644 (file)
--- a/include/llvm/Support/PathV2.h
+++ b/include/llvm/Support/PathV2.h
@@ -140,7 +140,7 @@ error_code make_absolute(SmallVectorImpl<char> &path);
 /// @brief Remove the last component from \a path if it exists.
 ///
 /// directory/filename.cpp => directory/
-/// directory/             => directory/
+/// directory/             => directory
 ///
 /// @param path A path that is modified to not have a file component.
 /// @returns errc::success if \a path's file name has been removed (or there was

diff --git a/lib/Support/PathV2.cpp b/lib/Support/PathV2.cpp
index a97f3ec711fef2e8f53ff23fd2dbcb7e09069c5f..df401bd46baa261528282cb0840ed7bba83f354f 100644 (file)
--- a/lib/Support/PathV2.cpp
+++ b/lib/Support/PathV2.cpp
@@ -503,6 +503,14 @@ error_code parent_path(const StringRef &path, StringRef &result) {
   return make_error_code(errc::success);
 }
 
+error_code remove_filename(SmallVectorImpl<char> &path) {
+  size_t end_pos = parent_path_end(StringRef(path.begin(), path.size()));
+  if (end_pos == StringRef::npos)
+    return make_error_code(errc::success);
+  path.set_size(end_pos);
+  return make_error_code(errc::success);
+}
+
 }
 }
 }

diff --git a/unittests/Support/Path.cpp b/unittests/Support/Path.cpp
index b8f818ff1dbd2030f0fb75ac3003f9a01205948b..5ab74e14f70f28677d2bb520332479481595d1a8 100644 (file)
--- a/unittests/Support/Path.cpp
+++ b/unittests/Support/Path.cpp
@@ -99,6 +99,10 @@ TEST(Support, Path) {
     if (error_code ec = sys::path::make_absolute(temp_store))
       ASSERT_FALSE(ec.message().c_str());
     outs() << "    make_absolute: " << temp_store << '\n';
+    temp_store = *i;
+    if (error_code ec = sys::path::remove_filename(temp_store))
+      ASSERT_FALSE(ec.message().c_str());
+    outs() << "    remove_filename: " << temp_store << '\n';
 
     outs().flush();
   }