From: Zachary Turner <zturner@google.com>
Date: Wed, 11 Feb 2015 21:16:35 +0000 (+0000)
Subject: Change Path::filename_pos() to skip the drive letter.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b357516cb42b29047ca3eb89a8a59ab6924f6587;p=oota-llvm.git

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 abec7b9dd22..3e0a4f5aab9 100644
--- 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 ||