aboutsummaryrefslogtreecommitdiff
path: root/lib/Frontend/TextDiagnosticPrinter.cpp
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2011-09-26 01:44:29 +0000
committerChandler Carruth <chandlerc@gmail.com>2011-09-26 01:44:29 +0000
commit3a2180910a2e6008c2c282f885708d822d2f12c2 (patch)
treef7440518269a9a801f3e8b84a96e5d4c64e1b185 /lib/Frontend/TextDiagnosticPrinter.cpp
parent45b19dea3633737cabdd9a86477f7f2e07024595 (diff)
Remove support for splitting word-wrapped diagnostic messages on newline
characters. I could find no newline character in a diagnostic message, and adding an assert to this code never fires in the testsuite. I think this code is essentially dead, and was previously used for a different purpose. If I just don't understand how it is we can end up with a newline here please let me know (with a test case?) and I'll revert. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140497 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend/TextDiagnosticPrinter.cpp')
-rw-r--r--lib/Frontend/TextDiagnosticPrinter.cpp20
1 files changed, 2 insertions, 18 deletions
diff --git a/lib/Frontend/TextDiagnosticPrinter.cpp b/lib/Frontend/TextDiagnosticPrinter.cpp
index 6e464f1872..3fd91b2c76 100644
--- a/lib/Frontend/TextDiagnosticPrinter.cpp
+++ b/lib/Frontend/TextDiagnosticPrinter.cpp
@@ -1100,17 +1100,7 @@ static bool printWordWrapped(raw_ostream &OS,
unsigned Columns,
unsigned Column = 0,
unsigned Indentation = WordWrapIndentation) {
- unsigned Length = Str.size();
-
- // If there is a newline in this message somewhere, find that
- // newline and split the message into the part before the newline
- // (which will be word-wrapped) and the part from the newline one
- // (which will be emitted unchanged).
- for (unsigned I = 0; I != Length; ++I)
- if (Str[I] == '\n') {
- Length = I;
- break;
- }
+ const unsigned Length = Str.size();
// The string used to indent each line.
llvm::SmallString<16> IndentStr;
@@ -1148,13 +1138,7 @@ static bool printWordWrapped(raw_ostream &OS,
Wrapped = true;
}
- if (Length == Str.size())
- return Wrapped; // We're done.
-
- // There is a newline in the message, followed by something that
- // will not be word-wrapped. Print that.
- OS.write(&Str[Length], Str.size() - Length);
- return true;
+ return Wrapped;
}
void TextDiagnosticPrinter::HandleDiagnostic(DiagnosticsEngine::Level Level,