summaryrefslogtreecommitdiff
path: root/lib/System
diff options
context:
space:
mode:
authorDan Gohman <gohman@apple.com>2010-11-03 00:01:23 +0000
committerDan Gohman <gohman@apple.com>2010-11-03 00:01:23 +0000
commitaabb9b67bcb7e69f73fcd249f0c31c2959a5c3b3 (patch)
tree0b8f5736c21027154a6cf807657a81165bb9f6b5 /lib/System
parent4c914125c4d1746dd2436cb5b1620efd6182f1db (diff)
downloadllvm-aabb9b67bcb7e69f73fcd249f0c31c2959a5c3b3.tar.gz
llvm-aabb9b67bcb7e69f73fcd249f0c31c2959a5c3b3.tar.bz2
llvm-aabb9b67bcb7e69f73fcd249f0c31c2959a5c3b3.tar.xz
Remove several unhelpful checks for isValid from sys::Path.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118127 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/System')
-rw-r--r--lib/System/Unix/Path.inc30
1 files changed, 4 insertions, 26 deletions
diff --git a/lib/System/Unix/Path.inc b/lib/System/Unix/Path.inc
index c90092001e..a8ae1a756b 100644
--- a/lib/System/Unix/Path.inc
+++ b/lib/System/Unix/Path.inc
@@ -149,10 +149,7 @@ Path::GetTemporaryDirectory(std::string *ErrMsg) {
std::string(pathname) + ": can't create temporary directory");
return Path();
}
- Path result;
- result.set(pathname);
- assert(result.isValid() && "mkdtemp didn't create a valid pathname!");
- return result;
+ return Path(pathname);
#elif defined(HAVE_MKSTEMP)
// If no mkdtemp is available, mkstemp can be used to create a temporary file
// which is then removed and created as a directory. We prefer this over
@@ -173,10 +170,7 @@ Path::GetTemporaryDirectory(std::string *ErrMsg) {
std::string(pathname) + ": can't create temporary directory");
return Path();
}
- Path result;
- result.set(pathname);
- assert(result.isValid() && "mkstemp didn't create a valid pathname!");
- return result;
+ return Path(pathname);
#elif defined(HAVE_MKTEMP)
// If a system doesn't have mkdtemp(3) or mkstemp(3) but it does have
// mktemp(3) then we'll assume that system (e.g. AIX) has a reasonable
@@ -195,10 +189,7 @@ Path::GetTemporaryDirectory(std::string *ErrMsg) {
std::string(TmpName) + ": can't create temporary directory");
return Path();
}
- Path result;
- result.set(TmpName);
- assert(result.isValid() && "mktemp didn't create a valid pathname!");
- return result;
+ return Path(TmpName);
#else
// This is the worst case implementation. tempnam(3) leaks memory unless its
// on an SVID2 (or later) system. On BSD 4.3 it leaks. tmpnam(3) has thread
@@ -219,10 +210,7 @@ Path::GetTemporaryDirectory(std::string *ErrMsg) {
std::string(pathname) + ": can't create temporary directory");
return Path();
}
- Path result;
- result.set(pathname);
- assert(result.isValid() && "mkstemp didn't create a valid pathname!");
- return result;
+ return Path(pathname);
#endif
}
@@ -597,10 +585,6 @@ Path::set(StringRef a_path) {
return false;
std::string save(path);
path = a_path;
- if (!isValid()) {
- path = save;
- return false;
- }
return true;
}
@@ -612,10 +596,6 @@ Path::appendComponent(StringRef name) {
if (!lastIsSlash(path))
path += '/';
path += name;
- if (!isValid()) {
- path = save;
- return false;
- }
return true;
}
@@ -647,8 +627,6 @@ Path::eraseSuffix() {
return true;
}
}
- if (!isValid())
- path = save;
return false;
}