diff options
author | Dan Gohman <gohman@apple.com> | 2009-07-15 23:25:33 +0000 |
---|---|---|
committer | Dan Gohman <gohman@apple.com> | 2009-07-15 23:25:33 +0000 |
commit | e87b2abe91fc44bb9875188d80e3a43a9dfc41eb (patch) | |
tree | 1b99511fbb47295ae25647143b4a4e5d0e514a36 /include/llvm/Support/raw_ostream.h | |
parent | 1e1f8ba28cc05212dfd347be219daa698d7294a5 (diff) | |
download | llvm-e87b2abe91fc44bb9875188d80e3a43a9dfc41eb.tar.gz llvm-e87b2abe91fc44bb9875188d80e3a43a9dfc41eb.tar.bz2 llvm-e87b2abe91fc44bb9875188d80e3a43a9dfc41eb.tar.xz |
Change raw_ostream so that it doesn't call llvm_report_error
immediately on every output error. Instead, add a flag to
raw_ostream, and set the flag whenever an error is detected.
The flag can be queried and cleared from the public API. This
gives applications more flexibility to handling errors in
application-specific ways.
If the flag is not cleared when the raw_ostream is destructed,
llvm_report_error is called from the destructor. This ensures
that errors are not implicitly silenced, and provides
convenient default behavior for tools like llc and opt.
Clients wishing to avoid llvm_report_error calls from
raw_ostream should check for errors and clear the error flag.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75857 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/Support/raw_ostream.h')
-rw-r--r-- | include/llvm/Support/raw_ostream.h | 39 |
1 files changed, 31 insertions, 8 deletions
diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h index 2cf9d22903..367c35ca12 100644 --- a/include/llvm/Support/raw_ostream.h +++ b/include/llvm/Support/raw_ostream.h @@ -44,6 +44,10 @@ private: char *OutBufStart, *OutBufEnd, *OutBufCur; bool Unbuffered; + /// Error This flag is true if an error of any kind has been detected. + /// + bool Error; + public: // color order matches ANSI escape sequence, don't change enum Colors { @@ -58,18 +62,31 @@ public: SAVEDCOLOR }; - explicit raw_ostream(bool unbuffered=false) : Unbuffered(unbuffered) { + explicit raw_ostream(bool unbuffered=false) + : Unbuffered(unbuffered), Error(false) { // Start out ready to flush. OutBufStart = OutBufEnd = OutBufCur = 0; } - virtual ~raw_ostream() { - delete [] OutBufStart; - } + virtual ~raw_ostream(); /// tell - Return the current offset with the file. uint64_t tell() { return current_pos() + GetNumBytesInBuffer(); } + /// has_error - Return the value of the flag in this raw_ostream indicating + /// whether an output error has been encountered. + bool has_error() const { + return Error; + }; + + /// clear_error - Set the flag read by has_error() to false. If the error + /// flag is set at the time when this raw_ostream's destructor is called, + /// llvm_report_error is called to report the error. Use clear_error() + /// after handling the error to avoid this behavior. + void clear_error() { + Error = false; + }; + //===--------------------------------------------------------------------===// // Configuration Interface //===--------------------------------------------------------------------===// @@ -213,6 +230,11 @@ private: /// counting the bytes currently in the buffer. virtual uint64_t current_pos() = 0; +protected: + /// error_detected - Set the flag indicating that an output error has + /// been encountered. + void error_detected() { Error = true; } + //===--------------------------------------------------------------------===// // Private Interface //===--------------------------------------------------------------------===// @@ -311,8 +333,8 @@ raw_ostream &errs(); //===----------------------------------------------------------------------===// /// raw_os_ostream - A raw_ostream that writes to an std::ostream. This is a -/// simple adaptor class. It does not check for I/O errors; clients should use -/// the underlying stream to detect errors. +/// simple adaptor class. It does not check for output errors; clients should +/// use the underlying stream to detect errors. class raw_os_ostream : public raw_ostream { std::ostream &OS; @@ -332,7 +354,7 @@ public: }; /// raw_string_ostream - A raw_ostream that writes to an std::string. This is a -/// simple adaptor class. +/// simple adaptor class. This class does not encounter output errors. class raw_string_ostream : public raw_ostream { std::string &OS; @@ -358,7 +380,8 @@ public: }; /// raw_svector_ostream - A raw_ostream that writes to an SmallVector or -/// SmallString. This is a simple adaptor class. +/// SmallString. This is a simple adaptor class. This class does not +/// encounter output errors. class raw_svector_ostream : public raw_ostream { SmallVectorImpl<char> &OS; |