From b7be0e8afc5378c77c70e3c0fb6a03c74e551688 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 19 Aug 2009 18:09:47 +0000 Subject: [PATCH] Switch Twine::str() to use toVector(), which is now efficient. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79437 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/Twine.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/lib/Support/Twine.cpp b/lib/Support/Twine.cpp index 611af8c5ae0..292c0c2b9e5 100644 --- a/lib/Support/Twine.cpp +++ b/lib/Support/Twine.cpp @@ -8,27 +8,17 @@ //===----------------------------------------------------------------------===// #include "llvm/ADT/Twine.h" +#include "llvm/ADT/SmallString.h" #include "llvm/Support/raw_ostream.h" using namespace llvm; std::string Twine::str() const { - // FIXME: This should probably use the toVector implementation, once that is - // efficient. - std::string Res; - raw_string_ostream OS(Res); - print(OS); - OS.flush(); - return Res; + SmallString<256> Vec; + toVector(Vec); + return std::string(Vec.begin(), Vec.end()); } void Twine::toVector(SmallVectorImpl &Out) const { - // FIXME: This is very inefficient, since we are creating a large raw_ostream - // buffer -- hitting malloc, which we were supposed to avoid -- all when we - // have this pretty little small vector available. - // - // The best way to fix this is to make raw_svector_ostream do the right thing - // and be efficient, by augmenting the base raw_ostream with the ability to - // have the buffer managed by a concrete implementation. raw_svector_ostream OS(Out); print(OS); }