From 14ca177beba15e86ca410c9f6fc7f48ba245dba6 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 22 Jan 2010 21:16:10 +0000 Subject: [PATCH] Changes to fix buffering that I forgot to commit with previous patch. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94222 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/raw_ostream.h | 6 ++++-- lib/MC/MCAsmStreamer.cpp | 7 ++++++- lib/Support/raw_ostream.cpp | 13 ++++++++----- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h index 05794e58988..0f227ccc3f8 100644 --- a/include/llvm/Support/raw_ostream.h +++ b/include/llvm/Support/raw_ostream.h @@ -456,8 +456,10 @@ public: explicit raw_svector_ostream(SmallVectorImpl &O); ~raw_svector_ostream(); - /// clear - Flush the stream and clear the underlying vector. - void clear(); + /// resync - This is called when the SmallVector we're appending to is changed + /// outside of the raw_svector_ostream's control. It is only safe to do this + /// if the raw_svector_ostream has previously been flushed. + void resync(); /// str - Flushes the stream contents to the target vector and return a /// StringRef for the vector contents. diff --git a/lib/MC/MCAsmStreamer.cpp b/lib/MC/MCAsmStreamer.cpp index e284e15bca2..d4ef3ca826c 100644 --- a/lib/MC/MCAsmStreamer.cpp +++ b/lib/MC/MCAsmStreamer.cpp @@ -136,6 +136,9 @@ void MCAsmStreamer::AddComment(const Twine &T) { T.toVector(CommentToEmit); // Each comment goes on its own line. CommentToEmit.push_back('\n'); + + // Tell the comment stream that the vector changed underneath it. + CommentStream.resync(); } void MCAsmStreamer::EmitCommentsAndEOL() { @@ -158,7 +161,9 @@ void MCAsmStreamer::EmitCommentsAndEOL() { Comments = Comments.substr(Position+1); } while (!Comments.empty()); - CommentStream.clear(); + CommentToEmit.clear(); + // Tell the comment stream that the vector changed underneath it. + CommentStream.resync(); } diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp index 7cd16c888b9..10d7ec07012 100644 --- a/lib/Support/raw_ostream.cpp +++ b/lib/Support/raw_ostream.cpp @@ -562,11 +562,14 @@ raw_svector_ostream::~raw_svector_ostream() { flush(); } -/// clear - Flush the stream and clear the underlying vector. -void raw_svector_ostream::clear() { - if (GetNumBytesInBuffer() == 0) flush(); - - OS.clear(); +/// resync - This is called when the SmallVector we're appending to is changed +/// outside of the raw_svector_ostream's control. It is only safe to do this +/// if the raw_svector_ostream has previously been flushed. +void raw_svector_ostream::resync() { + assert(GetNumBytesInBuffer() == 0 && "Didn't flush before mutating vector"); + + if (OS.capacity() - OS.size() < 64) + OS.reserve(OS.capacity() * 2); SetBuffer(OS.end(), OS.capacity() - OS.size()); } -- 2.34.1