replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove several unhelpful checks for isValid from sys::Path. 

llvm-svn: 118127
This commit is contained in:
Dan Gohman 2010-11-03 00:01:23 +00:00
parent 1e43892e4b
commit ecc4d73498
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
llvm/lib/System/Unix/Path.inc
View File

@ -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;
}