diff options
| -rw-r--r-- | include/llvm/Support/PathV2.h | 2 | ||||
| -rw-r--r-- | lib/Support/PathV2.cpp | 8 | ||||
| -rw-r--r-- | unittests/Support/Path.cpp | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/include/llvm/Support/PathV2.h b/include/llvm/Support/PathV2.h index e1b0a1d0e3..c3feca7acc 100644 --- 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 a97f3ec711..df401bd46b 100644 --- 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 b8f818ff1d..5ab74e14f7 100644 --- 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(); } |