Twines: Support numeric conversion directly (uitostr, etc).
- Provides static constructors for doing number to string conversions without
using temporaries.
- There are several ways to do this, I think given the Twine constraints this
is the simplest one.
- One FIXME for fast number -> hex conversion.
- Added another comment on one last major bit of perf work Twines need, which
is to make raw_svector_ostream more efficient.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77445 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Support/Twine.cpp b/lib/Support/Twine.cpp
index 4c34d27..c9e5f24 100644
--- a/lib/Support/Twine.cpp
+++ b/lib/Support/Twine.cpp
@@ -19,6 +19,13 @@
}
void Twine::toVector(SmallVectorImpl<char> &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);
}
@@ -28,6 +35,9 @@
switch (Kind) {
case Twine::NullKind: break;
case Twine::EmptyKind: break;
+ case Twine::TwineKind:
+ static_cast<const Twine*>(Ptr)->print(OS);
+ break;
case Twine::CStringKind:
OS << static_cast<const char*>(Ptr);
break;
@@ -37,8 +47,15 @@
case Twine::StringRefKind:
OS << *static_cast<const StringRef*>(Ptr);
break;
- case Twine::TwineKind:
- static_cast<const Twine*>(Ptr)->print(OS);
+ case Twine::UDecKind:
+ OS << *static_cast<const uint64_t*>(Ptr);
+ break;
+ case Twine::SDecKind:
+ OS << *static_cast<const int64_t*>(Ptr);
+ break;
+ case Twine::UHexKind:
+ // FIXME: Add raw_ostream functionality for this.
+ OS << ::utohexstr(*static_cast<const uint64_t*>(Ptr));
break;
}
}
@@ -50,22 +67,31 @@
OS << "null"; break;
case Twine::EmptyKind:
OS << "empty"; break;
- case Twine::CStringKind:
- OS << "cstring:\""
- << static_cast<const char*>(Ptr) << "\"";
- break;
- case Twine::StdStringKind:
- OS << "std::string:\""
- << *static_cast<const std::string*>(Ptr) << "\"";
- break;
- case Twine::StringRefKind:
- OS << "stringref:\""
- << *static_cast<const StringRef*>(Ptr) << "\"";
- break;
case Twine::TwineKind:
OS << "rope:";
static_cast<const Twine*>(Ptr)->printRepr(OS);
break;
+ case Twine::CStringKind:
+ OS << "cstring:\""
+ << static_cast<const char*>(Ptr) << "\"";
+ break;
+ case Twine::StdStringKind:
+ OS << "std::string:\""
+ << static_cast<const std::string*>(Ptr) << "\"";
+ break;
+ case Twine::StringRefKind:
+ OS << "stringref:\""
+ << static_cast<const StringRef*>(Ptr) << "\"";
+ break;
+ case Twine::UDecKind:
+ OS << "udec:" << static_cast<const uint64_t*>(Ptr) << "\"";
+ break;
+ case Twine::SDecKind:
+ OS << "sdec:" << static_cast<const int64_t*>(Ptr) << "\"";
+ break;
+ case Twine::UHexKind:
+ OS << "uhex:" << static_cast<const uint64_t*>(Ptr) << "\"";
+ break;
}
}