6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-01 00:33:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix the rest of rdar://8318441 which happens when a raw_fd_ostream

Browse Source 
(e.g. errs()) fails in close() due to (e.g.) a broken pipe.  As
previously written, the had_error() flag would get set and then
the raw_ostream dtor would report a fatal error.  There is nothing
the client can do about this and we have no way to report the error,
so just eat it.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@111321 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2010-08-17 23:11:56 +00:00
parent 73ebaff79f
commit 93d81b697c
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/Support/raw_ostream.cpp
View File

@ -415,15 +415,31 @@ raw_fd_ostream::raw_fd_ostream(const char *Filename, std::string &ErrorInfo,
raw_fd_ostream::~raw_fd_ostream() {
if (FD < 0) return;
flush();
if (ShouldClose)
while (::close(FD) != 0)
if (errno != EINTR) {
error_detected();
break;
}
if (!ShouldClose) {
flush();
return;
}
bool HadError = has_error();
close();
// If we had a failure closing the stream, there is no way for the client to
// handle it, just eat the failure.
if (!HadError && has_error())
clear_error();
}
void raw_fd_ostream::close() {
assert(ShouldClose);
ShouldClose = false;
flush();
while (::close(FD) != 0)
if (errno != EINTR) {
error_detected();
break;
}
FD = -1;
}
void raw_fd_ostream::write_impl(const char *Ptr, size_t Size) {
assert(FD >= 0 && "File already closed.");
@ -461,18 +477,6 @@ void raw_fd_ostream::write_impl(const char *Ptr, size_t Size) {
} while (Size > 0);
}
void raw_fd_ostream::close() {
assert(ShouldClose);
ShouldClose = false;
flush();
while (::close(FD) != 0)
if (errno != EINTR) {
error_detected();
break;
}
FD = -1;
}
uint64_t raw_fd_ostream::seek(uint64_t off) {
flush();
pos = ::lseek(FD, off, SEEK_SET);