Change Path::filename_pos() to skip the drive letter.

For Windows, filename_pos() tries to find the filename by
searching for separators after the last :.  Instead, it should
really check for the only location that a : is valid, which is
in the second character, and search for separators after that.

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

diff --git a/lib/Support/Path.cpp b/lib/Support/Path.cpp
index abec7b9dd221e135bacf6ffc2abd5f61847bd5e8..3e0a4f5aab97466b412bf3fb83f23b1a25ff2ec6 100644 (file)
--- a/lib/Support/Path.cpp
+++ b/lib/Support/Path.cpp
@@ -98,8 +98,11 @@ namespace {
     size_t pos = str.find_last_of(separators, str.size() - 1);
 
 #ifdef LLVM_ON_WIN32
-    if (pos == StringRef::npos)
-      pos = str.find_last_of(':', str.size() - 2);
+    if (pos == StringRef::npos) {
+      // Skip the drive letter, if one exists.
+      if (str.size() >= 2 && str[1] == ':')
+        pos = 2;
+    }
 #endif
 
     if (pos == StringRef::npos ||