For PR797:
Eliminate exception throwing from Path::renamePathOnDisk and adjust its
users correspondingly.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29843 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/System/Path.h b/include/llvm/System/Path.h
index 5609f61..368fe20 100644
--- a/include/llvm/System/Path.h
+++ b/include/llvm/System/Path.h
@@ -492,10 +492,9 @@
/// This method renames the file referenced by \p this as \p newName. The
/// file referenced by \p this must exist. The file referenced by
/// \p newName does not need to exist.
- /// @returns true
- /// @throws std::string if there is an file system error.
+ /// @returns true on error, false otherwise
/// @brief Rename one file as another.
- bool renamePathOnDisk(const Path& newName);
+ bool renamePathOnDisk(const Path& newName, std::string* ErrMsg);
/// This method attempts to destroy the file or directory named by the
/// last component of the Path. If the Path refers to a directory and the
diff --git a/lib/Archive/ArchiveWriter.cpp b/lib/Archive/ArchiveWriter.cpp
index c3fda5f..86da17c 100644
--- a/lib/Archive/ArchiveWriter.cpp
+++ b/lib/Archive/ArchiveWriter.cpp
@@ -496,7 +496,8 @@
arch.close();
// Move the final file over top of TmpArchive
- FinalFilePath.renamePathOnDisk(TmpArchive);
+ if (FinalFilePath.renamePathOnDisk(TmpArchive, error))
+ return false;
}
// Before we replace the actual archive, we need to forget all the
@@ -504,7 +505,8 @@
// this because we cannot replace an open file on Windows.
cleanUpMemory();
- TmpArchive.renamePathOnDisk(archPath);
+ if (TmpArchive.renamePathOnDisk(archPath, error))
+ return false;
return true;
}
diff --git a/lib/Bytecode/Archive/ArchiveWriter.cpp b/lib/Bytecode/Archive/ArchiveWriter.cpp
index c3fda5f..86da17c 100644
--- a/lib/Bytecode/Archive/ArchiveWriter.cpp
+++ b/lib/Bytecode/Archive/ArchiveWriter.cpp
@@ -496,7 +496,8 @@
arch.close();
// Move the final file over top of TmpArchive
- FinalFilePath.renamePathOnDisk(TmpArchive);
+ if (FinalFilePath.renamePathOnDisk(TmpArchive, error))
+ return false;
}
// Before we replace the actual archive, we need to forget all the
@@ -504,7 +505,8 @@
// this because we cannot replace an open file on Windows.
cleanUpMemory();
- TmpArchive.renamePathOnDisk(archPath);
+ if (TmpArchive.renamePathOnDisk(archPath, error))
+ return false;
return true;
}
diff --git a/lib/System/Unix/Path.inc b/lib/System/Unix/Path.inc
index 2b9f126..fd99250 100644
--- a/lib/System/Unix/Path.inc
+++ b/lib/System/Unix/Path.inc
@@ -391,36 +391,28 @@
}
bool Path::makeReadableOnDisk(std::string* ErrMsg) {
- if (!AddPermissionBits(*this, 0444)) {
- MakeErrMsg(ErrMsg, path + ": can't make file readable");
- return true;
- }
+ if (!AddPermissionBits(*this, 0444))
+ return MakeErrMsg(ErrMsg, path + ": can't make file readable");
return false;
}
bool Path::makeWriteableOnDisk(std::string* ErrMsg) {
- if (!AddPermissionBits(*this, 0222)) {
- MakeErrMsg(ErrMsg, path + ": can't make file writable");
- return true;
- }
+ if (!AddPermissionBits(*this, 0222))
+ return MakeErrMsg(ErrMsg, path + ": can't make file writable");
return false;
}
bool Path::makeExecutableOnDisk(std::string* ErrMsg) {
- if (!AddPermissionBits(*this, 0111)) {
- MakeErrMsg(ErrMsg, path + ": can't make file executable");
- return true;
- }
+ if (!AddPermissionBits(*this, 0111))
+ return MakeErrMsg(ErrMsg, path + ": can't make file executable");
return false;
}
bool
Path::getDirectoryContents(std::set<Path>& result, std::string* ErrMsg) const {
DIR* direntries = ::opendir(path.c_str());
- if (direntries == 0) {
- MakeErrMsg(ErrMsg, path + ": can't open directory");
- return true;
- }
+ if (direntries == 0)
+ return MakeErrMsg(ErrMsg, path + ": can't open directory");
std::string dirPath = path;
if (!lastIsSlash(dirPath))
@@ -435,8 +427,8 @@
if (0 != lstat(aPath.path.c_str(), &st)) {
if (S_ISLNK(st.st_mode))
continue; // dangling symlink -- ignore
- MakeErrMsg(ErrMsg, aPath.path + ": can't determine file object type");
- return true;
+ return MakeErrMsg(ErrMsg,
+ aPath.path + ": can't determine file object type");
}
result.insert(aPath);
}
@@ -544,9 +536,8 @@
*next = 0;
if (0 != access(pathname, F_OK | R_OK | W_OK))
if (0 != mkdir(pathname, S_IRWXU | S_IRWXG)) {
- MakeErrMsg(ErrMsg,
- std::string(pathname) + ": can't create directory");
- return true;
+ return MakeErrMsg(ErrMsg,
+ std::string(pathname) + ": can't create directory");
}
char* save = next;
next = strchr(next+1,'/');
@@ -556,8 +547,8 @@
if (0 != access(pathname, F_OK | R_OK))
if (0 != mkdir(pathname, S_IRWXU | S_IRWXG)) {
- MakeErrMsg(ErrMsg, std::string(pathname) + ": can't create directory");
- return true;
+ return MakeErrMsg(ErrMsg,
+ std::string(pathname) + ": can't create directory");
}
return false;
}
@@ -566,10 +557,8 @@
Path::createFileOnDisk(std::string* ErrMsg) {
// Create the file
int fd = ::creat(path.c_str(), S_IRUSR | S_IWUSR);
- if (fd < 0) {
- MakeErrMsg(ErrMsg, path + ": can't create file");
- return true;
- }
+ if (fd < 0)
+ return MakeErrMsg(ErrMsg, path + ": can't create file");
::close(fd);
return false;
}
@@ -581,10 +570,8 @@
// create the file
int fd = ::open(path.c_str(), O_WRONLY|O_CREAT|O_TRUNC, 0666);
- if (fd < 0) {
- MakeErrMsg(ErrMsg, path + ": can't create temporary file");
- return true;
- }
+ if (fd < 0)
+ return MakeErrMsg(ErrMsg, path + ": can't create temporary file");
::close(fd);
return false;
}
@@ -633,11 +620,11 @@
}
bool
-Path::renamePathOnDisk(const Path& newName) {
+Path::renamePathOnDisk(const Path& newName, std::string* ErrMsg) {
if (0 != ::rename(path.c_str(), newName.c_str()))
- ThrowErrno(std::string("can't rename '") + path + "' as '" +
+ return MakeErrMsg(ErrMsg, std::string("can't rename '") + path + "' as '" +
newName.toString() + "' ");
- return true;
+ return false;
}
bool
diff --git a/lib/System/Unix/Unix.h b/lib/System/Unix/Unix.h
index 1516d45..0f9b96a 100644
--- a/lib/System/Unix/Unix.h
+++ b/lib/System/Unix/Unix.h
@@ -123,10 +123,10 @@
/// string and the Unix error number given by \p errnum. If errnum is -1, the
/// default then the value of errno is used.
/// @brief Make an error message
-inline void MakeErrMsg(
+inline bool MakeErrMsg(
std::string* ErrMsg, const std::string& prefix, int errnum = -1) {
if (!ErrMsg)
- return;
+ return true;
char buffer[MAXPATHLEN];
buffer[0] = 0;
if (errnum == -1)
@@ -148,6 +148,7 @@
sprintf(buffer, "Error #%d", errnum);
#endif
*ErrMsg = buffer;
+ return true;
}
#endif
diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc
index 913a409..ece5727 100644
--- a/lib/System/Win32/Path.inc
+++ b/lib/System/Win32/Path.inc
@@ -651,10 +651,10 @@
}
bool
-Path::renamePathOnDisk(const Path& newName) {
+Path::renamePathOnDisk(const Path& newName, std::string* ErrMsg) {
if (!MoveFileEx(path.c_str(), newName.c_str(), MOVEFILE_REPLACE_EXISTING))
- ThrowError("Can't move '" + path +
- "' to '" + newName.path + "': ");
+ return MakeErrMsg(ErrMsg, "Can't move '" + path + "' to '" + newName.path
+ + "': ");
return true;
}
diff --git a/lib/System/Win32/Win32.h b/lib/System/Win32/Win32.h
index 7243548..2238faa 100644
--- a/lib/System/Win32/Win32.h
+++ b/lib/System/Win32/Win32.h
@@ -44,14 +44,15 @@
throw s;
}
-inline void MakeErrMsg(std::string* ErrMsg, const std::string& prefix) {
+inline bool MakeErrMsg(std::string* ErrMsg, const std::string& prefix) {
if (!ErrMsg)
- return;
+ return true;
char *buffer = NULL;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
NULL, GetLastError(), 0, (LPSTR)&buffer, 1, NULL);
ErrMsg = prefix + buffer;
LocalFree(buffer);
+ return true;
}
inline void ThrowErrno(const std::string& prefix) {
diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp
index 53f04e6..6b9adaf 100644
--- a/tools/llvm-ld/llvm-ld.cpp
+++ b/tools/llvm-ld/llvm-ld.cpp
@@ -505,7 +505,10 @@
if (tmp_output.isBytecodeFile()) {
sys::Path target(RealBytecodeOutput);
target.eraseFromDisk();
- tmp_output.renamePathOnDisk(target);
+ if (tmp_output.renamePathOnDisk(target, &ErrMsg)) {
+ std::cerr << argv[0] << ": " << ErrMsg << "\n";
+ return 2;
+ }
} else
return PrintAndReturn(
"Post-link optimization output is not bytecode");