From 82d372e12bc20de0a37c23a9a1f288f4fda0dae2 Mon Sep 17 00:00:00 2001 From: Ben Langmuir Date: Wed, 5 Mar 2014 19:56:30 +0000 Subject: Fix an inconsistency in treatment of trailing / in path::const_iterator When using a //net/ path, we were transforming the trailing / into a '.' when the path was just the root path and we were iterating backwards. Forwards iteration and other kinds of root path (C:\, /) were already correct. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202999 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/Path.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/Support/Path.cpp b/lib/Support/Path.cpp index 1bd94a76fa..6fdad22158 100644 --- a/lib/Support/Path.cpp +++ b/lib/Support/Path.cpp @@ -307,21 +307,18 @@ const_iterator &const_iterator::operator++() { } const_iterator &const_iterator::operator--() { - // If we're at the end and the previous char was a '/', return '.'. + // If we're at the end and the previous char was a '/', return '.' unless + // we are the root path. + size_t root_dir_pos = root_dir_start(Path); if (Position == Path.size() && - Path.size() > 1 && - is_separator(Path[Position - 1]) -#ifdef LLVM_ON_WIN32 - && Path[Position - 2] != ':' -#endif - ) { + Path.size() > root_dir_pos + 1 && + is_separator(Path[Position - 1])) { --Position; Component = "."; return *this; } // Skip separators unless it's the root directory. - size_t root_dir_pos = root_dir_start(Path); size_t end_pos = Position; while(end_pos > 0 && -- cgit v1.2.3