Support/ADT/Twine: Make toNullTerminatedStringRef not rely on UB :(.

llvm-svn: 120791
This commit is contained in:
Michael J. Spencer 2010-12-03 05:42:25 +00:00
parent 31e310cda0
commit 73e60d029c
1 changed files with 12 additions and 4 deletions

View File

@ -31,10 +31,18 @@ StringRef Twine::toStringRef(SmallVectorImpl<char> &Out) const {
}
StringRef Twine::toNullTerminatedStringRef(SmallVectorImpl<char> &Out) const {
if (isSingleStringRef()) {
StringRef sr = getSingleStringRef();
if (*(sr.begin() + sr.size()) == 0)
return sr;
if (isUnary()) {
switch (getLHSKind()) {
case CStringKind:
// Already null terminated, yay!
return StringRef(static_cast<const char*>(LHS));
case StdStringKind: {
const std::string *str = static_cast<const std::string*>(LHS);
return StringRef(str->c_str(), str->size());
}
default:
break;
}
}
toVector(Out);
Out.push_back(0);