From 32f1acf14a649200b7818c56a0ab322d57733c20 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Thu, 17 Nov 2011 06:16:05 +0000 Subject: Revert r132539 for now, "My testing shows that function stat has no problem with trailing separators. (tested on Windows and Darwin)." It caused PR10331. MSVCRT stat() cannot strip trailing '/'. (can '\') llvm-svn: 144884 --- clang/lib/Basic/FileManager.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'clang/lib/Basic/FileManager.cpp') diff --git a/clang/lib/Basic/FileManager.cpp b/clang/lib/Basic/FileManager.cpp index 69e65bc38ad..274a9a1d257 100644 --- a/clang/lib/Basic/FileManager.cpp +++ b/clang/lib/Basic/FileManager.cpp @@ -265,6 +265,12 @@ void FileManager::addAncestorsAsVirtualDirs(StringRef Path) { /// const DirectoryEntry *FileManager::getDirectory(StringRef DirName, bool CacheFailure) { + // stat doesn't like trailing separators. + // At least, on Win32 MSVCRT, stat() cannot strip trailing '/'. + // (though it can strip '\\') + if (DirName.size() > 1 && llvm::sys::path::is_separator(DirName.back())) + DirName = DirName.substr(0, DirName.size()-1); + ++NumDirLookups; llvm::StringMapEntry &NamedDirEnt = SeenDirEntries.GetOrCreateValue(DirName); -- cgit v1.2.3