2 files changed, 78 insertions, 18 deletions

diff --git a/lib/Support/PathV2.cpp b/lib/Support/PathV2.cpp
index 47e59dd1cf..57ccf893d9 100644
--- a/lib/Support/PathV2.cpp
+++ b/lib/Support/PathV2.cpp
@@ -370,24 +370,6 @@ error_code root_directory(const StringRef &path, StringRef &result) {
   return make_error_code(errc::success);
 }
 
-error_code has_root_name(const Twine &path, bool &result) {
-  SmallString<128> storage;
-  StringRef p = path.toStringRef(storage);
-
-  if (error_code ec = root_name(p, p)) return ec;
-  result = !p.empty();
-  return make_error_code(errc::success);
-}
-
-error_code has_root_directory(const Twine &path, bool &result) {
-  SmallString<128> storage;
-  StringRef p = path.toStringRef(storage);
-
-  if (error_code ec = root_directory(p, p)) return ec;
-  result = !p.empty();
-  return make_error_code(errc::success);
-}
-
 error_code relative_path(const StringRef &path, StringRef &result) {
   StringRef root;
   if (error_code ec = root_path(path, root)) return ec;
@@ -590,6 +572,76 @@ error_code extension(const StringRef &path, StringRef &result) {
   return make_error_code(errc::success);
 }
 
+error_code has_root_name(const Twine &path, bool &result) {
+  SmallString<128> path_storage;
+  StringRef p = path.toStringRef(path_storage);
+
+  if (error_code ec = root_name(p, p)) return ec;
+
+  result = !p.empty();
+  return make_error_code(errc::success);
+}
+
+error_code has_root_directory(const Twine &path, bool &result) {
+  SmallString<128> path_storage;
+  StringRef p = path.toStringRef(path_storage);
+
+  if (error_code ec = root_directory(p, p)) return ec;
+
+  result = !p.empty();
+  return make_error_code(errc::success);
+}
+
+error_code has_root_path(const Twine &path, bool &result) {
+  SmallString<128> path_storage;
+  StringRef p = path.toStringRef(path_storage);
+
+  if (error_code ec = root_path(p, p)) return ec;
+
+  result = !p.empty();
+  return make_error_code(errc::success);
+}
+
+error_code has_filename(const Twine &path, bool &result) {
+  SmallString<128> path_storage;
+  StringRef p = path.toStringRef(path_storage);
+
+  if (error_code ec = filename(p, p)) return ec;
+
+  result = !p.empty();
+  return make_error_code(errc::success);
+}
+
+error_code has_parent_path(const Twine &path, bool &result) {
+  SmallString<128> path_storage;
+  StringRef p = path.toStringRef(path_storage);
+
+  if (error_code ec = parent_path(p, p)) return ec;
+
+  result = !p.empty();
+  return make_error_code(errc::success);
+}
+
+error_code has_stem(const Twine &path, bool &result) {
+  SmallString<128> path_storage;
+  StringRef p = path.toStringRef(path_storage);
+
+  if (error_code ec = stem(p, p)) return ec;
+
+  result = !p.empty();
+  return make_error_code(errc::success);
+}
+
+error_code has_extension(const Twine &path, bool &result) {
+  SmallString<128> path_storage;
+  StringRef p = path.toStringRef(path_storage);
+
+  if (error_code ec = extension(p, p)) return ec;
+
+  result = !p.empty();
+  return make_error_code(errc::success);
+}
+
 }
 }
 }
diff --git a/unittests/Support/Path.cpp b/unittests/Support/Path.cpp
index 27505ae5e3..3f50e708e6 100644
--- a/unittests/Support/Path.cpp
+++ b/unittests/Support/Path.cpp
@@ -96,13 +96,21 @@ TEST(Support, Path) {
     }
     outs() << "]\n";
 
+    bool      bres;
     StringRef sfres;
+    TEST_PATH(has_root_path, *i, bres);
     TEST_PATH(root_path, *i, sfres);
+    TEST_PATH(has_root_name, *i, bres);
     TEST_PATH(root_name, *i, sfres);
+    TEST_PATH(has_root_directory, *i, bres);
     TEST_PATH(root_directory, *i, sfres);
+    TEST_PATH(has_parent_path, *i, bres);
     TEST_PATH(parent_path, *i, sfres);
+    TEST_PATH(has_filename, *i, bres);
     TEST_PATH(filename, *i, sfres);
+    TEST_PATH(has_stem, *i, bres);
     TEST_PATH(stem, *i, sfres);
+    TEST_PATH(has_extension, *i, bres);
     TEST_PATH(extension, *i, sfres);
 
     SmallString<16> temp_store;