diff options
| -rw-r--r-- | include/llvm/Support/raw_ostream.h | 2 | ||||
| -rw-r--r-- | lib/Support/raw_ostream.cpp | 4 | ||||
| -rw-r--r-- | unittests/Support/raw_ostream_test.cpp | 10 |
3 files changed, 13 insertions, 3 deletions
diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h index dbad40ca91..7827dd8380 100644 --- a/include/llvm/Support/raw_ostream.h +++ b/include/llvm/Support/raw_ostream.h @@ -41,7 +41,7 @@ private: /// 1. Unbuffered (BufferMode == Unbuffered) /// 1. Uninitialized (BufferMode != Unbuffered && OutBufStart == 0). /// 2. Buffered (BufferMode != Unbuffered && OutBufStart != 0 && - /// OutBufEnd - OutBufStart >= 64). + /// OutBufEnd - OutBufStart >= 1). /// /// If buffered, then the raw_ostream owns the buffer if (BufferMode == /// InternalBuffer); otherwise the buffer has been set via SetBuffer and is diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp index 2cb3771287..0a82cc1d10 100644 --- a/lib/Support/raw_ostream.cpp +++ b/lib/Support/raw_ostream.cpp @@ -84,8 +84,8 @@ void raw_ostream::SetBuffered() { void raw_ostream::SetBufferAndMode(char *BufferStart, size_t Size, BufferKind Mode) { assert(((Mode == Unbuffered && BufferStart == 0 && Size == 0) || - (Mode != Unbuffered && BufferStart && Size >= 64)) && - "stream must be unbuffered, or have >= 64 bytes of buffer"); + (Mode != Unbuffered && BufferStart && Size)) && + "stream must be unbuffered or have at least one byte"); // Make sure the current buffer is free of content (we can't flush here; the // child buffer management logic will be in write_impl). assert(GetNumBytesInBuffer() == 0 && "Current buffer is non-empty!"); diff --git a/unittests/Support/raw_ostream_test.cpp b/unittests/Support/raw_ostream_test.cpp index 52639ba7a2..bd2e95cbb5 100644 --- a/unittests/Support/raw_ostream_test.cpp +++ b/unittests/Support/raw_ostream_test.cpp @@ -117,4 +117,14 @@ TEST(raw_ostreamTest, BufferEdge) { EXPECT_EQ("1.20", printToString(format("%.2f", 1.2), 10)); } +TEST(raw_ostreamTest, TinyBuffer) { + std::string Str; + raw_string_ostream OS(Str); + OS.SetBufferSize(1); + OS << "hello"; + OS << 1; + OS << 'w' << 'o' << 'r' << 'l' << 'd'; + EXPECT_EQ("hello1world", OS.str()); +} + } |