Change raw_svector_ostream to reserve the input buffer if necessary, Ted was

right.
 - This class turns out to be much more convenient to use if we do this; clients
   can make sure the buffer is always big enough if they care (since our current
   idiom tends to be to use a SmallString<256> for the input to this we should
   generally be avoiding an unnecessary malloc).

Also, add a convenience raw_svector_ostream::str method which flushes the buffer
and returns a StringRef for the vector contents.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79446 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h
index ed06dbf42e40d74d27b0a227f9d86d864b0dac93..dc496d46e054a7e32f106eec73c9f12dadb626c2 100644 (file)
--- a/include/llvm/Support/raw_ostream.h
+++ b/include/llvm/Support/raw_ostream.h
@@ -454,10 +454,14 @@ class raw_svector_ostream : public raw_ostream {
 public:
   /// Construct a new raw_svector_ostream.
   ///
-  /// \arg O - The vector to write to; this *must* have at least 128 bytes of
-  /// free space in it.
+  /// \arg O - The vector to write to; this should generally have at least 128
+  /// bytes free to avoid any extraneous memory overhead.
   explicit raw_svector_ostream(SmallVectorImpl<char> &O);
   ~raw_svector_ostream();
+
+  /// str - Flushes the stream contents to the target vector and return a
+  /// StringRef for the vector contents.
+  StringRef str();
 };
 
 /// raw_null_ostream - A raw_ostream that discards all output.

diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp
index 30bc76b7fd1e7b2a25c6667c46e4f2a64eb5a30e..917e6be6699d893bd760a726d4d396b8e62387e0 100644 (file)
--- a/lib/Support/raw_ostream.cpp
+++ b/lib/Support/raw_ostream.cpp
@@ -487,12 +487,11 @@ void raw_string_ostream::write_impl(const char *Ptr, size_t Size) {
 // and we only need to set the vector size when the data is flushed.
 
 raw_svector_ostream::raw_svector_ostream(SmallVectorImpl<char> &O) : OS(O) {
-  // Set up the initial external buffer. We enforce that the buffer must have at
+  // Set up the initial external buffer. We make sure that the buffer has at
   // least 128 bytes free; raw_ostream itself only requires 64, but we want to
   // make sure that we don't grow the buffer unnecessarily on destruction (when
   // the data is flushed). See the FIXME below.
-  if (OS.capacity() - OS.size() < 128)
-    llvm_report_error("Invalid argument, must have at least 128 bytes free!");
+  OS.reserve(OS.size() + 128);
   SetBuffer(OS.end(), OS.capacity() - OS.size());
 }
 
@@ -519,6 +518,11 @@ void raw_svector_ostream::write_impl(const char *Ptr, size_t Size) {
 
 uint64_t raw_svector_ostream::current_pos() { return OS.size(); }
 
+StringRef raw_svector_ostream::str() {
+  flush();
+  return StringRef(OS.begin(), OS.size());
+}
+
 //===----------------------------------------------------------------------===//
 //  raw_null_ostream
 //===----------------------------------------------------------------------===//