summaryrefslogtreecommitdiff
path: root/lib/Support/StringExtras.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Support/StringExtras.cpp')
-rw-r--r--lib/Support/StringExtras.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/Support/StringExtras.cpp b/lib/Support/StringExtras.cpp
index 687394a2fc..1b233ab200 100644
--- a/lib/Support/StringExtras.cpp
+++ b/lib/Support/StringExtras.cpp
@@ -63,8 +63,10 @@ void llvm::StringRef::split(SmallVectorImpl<StringRef> &A,
bool KeepEmpty) const {
StringRef rest = *this;
+ // rest.data() is used to distinguish cases like "a," that splits into
+ // "a" + "" and "a" that splits into "a" + 0.
for (int splits = 0;
- rest.size() != 0 && (MaxSplit < 0 || splits < MaxSplit);
+ rest.data() != NULL && (MaxSplit < 0 || splits < MaxSplit);
++splits) {
std::pair<llvm::StringRef, llvm::StringRef> p = rest.split(Separators);
@@ -72,7 +74,7 @@ void llvm::StringRef::split(SmallVectorImpl<StringRef> &A,
A.push_back(p.first);
rest = p.second;
}
-
- if (rest.size() != 0 || KeepEmpty)
+ // If we have a tail left, add it.
+ if (rest.data() != NULL && (rest.size() != 0 || KeepEmpty))
A.push_back(rest);
}