Updated to Clang 3.5a.
Change-Id: I8127eb568f674c2e72635b639a3295381fe8af82
diff --git a/lib/Frontend/TextDiagnosticBuffer.cpp b/lib/Frontend/TextDiagnosticBuffer.cpp
index 5821436..b1c793a 100644
--- a/lib/Frontend/TextDiagnosticBuffer.cpp
+++ b/lib/Frontend/TextDiagnosticBuffer.cpp
@@ -42,36 +42,16 @@
}
}
-/// \brief Escape diagnostic texts to avoid problems when they are fed into the
-/// diagnostic formatter a second time.
-static StringRef escapeDiag(StringRef Str, SmallVectorImpl<char> &Buf) {
- size_t Pos = Str.find('%');
- if (Pos == StringRef::npos)
- return Str;
-
- // We found a '%'. Replace this and all following '%' with '%%'.
- Buf.clear();
- Buf.append(Str.data(), Str.data() + Pos);
- for (size_t I = Pos, E = Str.size(); I != E; ++I) {
- if (Str[I] == '%')
- Buf.push_back('%');
- Buf.push_back(Str[I]);
- }
-
- return StringRef(Buf.data(), Buf.size());
-}
-
void TextDiagnosticBuffer::FlushDiagnostics(DiagnosticsEngine &Diags) const {
- SmallVector<char, 64> Buf;
// FIXME: Flush the diagnostics in order.
for (const_iterator it = err_begin(), ie = err_end(); it != ie; ++it)
- Diags.Report(Diags.getCustomDiagID(DiagnosticsEngine::Error,
- escapeDiag(it->second, Buf)));
+ Diags.Report(Diags.getCustomDiagID(DiagnosticsEngine::Error, "%0"))
+ << it->second;
for (const_iterator it = warn_begin(), ie = warn_end(); it != ie; ++it)
- Diags.Report(Diags.getCustomDiagID(DiagnosticsEngine::Warning,
- escapeDiag(it->second, Buf)));
+ Diags.Report(Diags.getCustomDiagID(DiagnosticsEngine::Warning, "%0"))
+ << it->second;
for (const_iterator it = note_begin(), ie = note_end(); it != ie; ++it)
- Diags.Report(Diags.getCustomDiagID(DiagnosticsEngine::Note,
- escapeDiag(it->second, Buf)));
+ Diags.Report(Diags.getCustomDiagID(DiagnosticsEngine::Note, "%0"))
+ << it->second;
}