summaryrefslogtreecommitdiffstats
path: root/llvm/lib/System/Unix/Path.inc
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
commitecc4d73498748211042a7c6dd5ae93109d50cd8d (patch)
treed57819ae47f6cbb6048d1fd6d11ff1f4b94e94fe /llvm/lib/System/Unix/Path.inc
parent1e43892e4b3138820d13fc72f7148ab81d6c0ee6 (diff)
downloadbcm5719-llvm-ecc4d73498748211042a7c6dd5ae93109d50cd8d.tar.gz
bcm5719-llvm-ecc4d73498748211042a7c6dd5ae93109d50cd8d.zip
Remove several unhelpful checks for isValid from sys::Path.
llvm-svn: 118127
Diffstat (limited to 'llvm/lib/System/Unix/Path.inc')
-rw-r--r--llvm/lib/System/Unix/Path.inc30
1 files changed, 4 insertions, 26 deletions
diff --git a/llvm/lib/System/Unix/Path.inc b/llvm/lib/System/Unix/Path.inc
index c90092001e3..a8ae1a756b4 100644
--- a/llvm/lib/System/Unix/Path.inc
+++ b/llvm/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;
}
OpenPOWER on IntegriCloud