From a07f720a1bde78ae2ff0fdc1fa73e8484c5938dd Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 17 Jul 2013 04:23:07 +0000 Subject: [PATCH] Use the simpler is_directory. llvm-svn: 186487 --- clang/lib/Driver/Driver.cpp | 3 +-- clang/lib/Frontend/CompilerInstance.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 41b6387..f49e790 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -1569,8 +1569,7 @@ std::string Driver::GetProgramPath(const char *Name, // attempting to use this prefix when looking for program paths. for (Driver::prefix_list::const_iterator it = PrefixDirs.begin(), ie = PrefixDirs.end(); it != ie; ++it) { - bool IsDirectory; - if (!llvm::sys::fs::is_directory(*it, IsDirectory) && IsDirectory) { + if (llvm::sys::fs::is_directory(*it)) { SmallString<128> P(*it); llvm::sys::path::append(P, TargetSpecificExecutable); if (llvm::sys::fs::can_execute(Twine(P))) diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp index 44d9ec2..f06eaf8 100644 --- a/clang/lib/Frontend/CompilerInstance.cpp +++ b/clang/lib/Frontend/CompilerInstance.cpp @@ -1052,8 +1052,7 @@ static void pruneModuleCache(const HeaderSearchOptions &HSOpts) { Dir(ModuleCachePathNative.str(), EC), DirEnd; Dir != DirEnd && !EC; Dir.increment(EC)) { // If we don't have a directory, there's nothing to look into. - bool IsDirectory; - if (llvm::sys::fs::is_directory(Dir->path(), IsDirectory) || !IsDirectory) + if (!llvm::sys::fs::is_directory(Dir->path())) continue; // Walk all of the files within this directory. -- 2.7.4