From: Zachary Turner <zturner@google.com>
Date: Thu, 12 Feb 2015 00:05:49 +0000 (+0000)
Subject: Revert "Change Path::filename_pos() to skip the drive letter."
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6f4e8d27e91952e52b5239cb8abf1ab6a9518279;p=oota-llvm.git

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

This reverts commit 228874.  For some reason users reported
seeing Clang taking up 25+GB of memory and bringing down
machines with this change.  Reverting until we figure it out.

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

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