Handle "Macro" PathDiagnosticPiece kind when getting string identifier.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66518 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Frontend/HTMLDiagnostics.cpp b/lib/Frontend/HTMLDiagnostics.cpp
index 5fa5ab7..02b327d 100644
--- a/lib/Frontend/HTMLDiagnostics.cpp
+++ b/lib/Frontend/HTMLDiagnostics.cpp
@@ -159,8 +159,7 @@
// Create a new rewriter to generate HTML.
Rewriter R(SMgr);
- // Process the path.
-
+ // Process the path.
unsigned n = D.size();
unsigned max = n;
@@ -376,7 +375,7 @@
switch (*I) {
default:
++cnt;
- continue;
+ continue;
case ' ':
case '\t':
case '\n':
@@ -410,9 +409,9 @@
// Now generate the message bubble.
const char *Kind = 0;
switch (P.getKind()) {
- default: break;
case PathDiagnosticPiece::Event: Kind = "Event"; break;
case PathDiagnosticPiece::ControlFlow: Kind = "Control"; break;
+ case PathDiagnosticPiece::Macro: Kind = "Macro"; break;
}
std::string sbuf;
diff --git a/lib/Frontend/PlistDiagnostics.cpp b/lib/Frontend/PlistDiagnostics.cpp
index c40794c..afd8b26 100644
--- a/lib/Frontend/PlistDiagnostics.cpp
+++ b/lib/Frontend/PlistDiagnostics.cpp
@@ -136,10 +136,14 @@
#endif
// Output the PathDiagnosticPiece::Kind.
Indent(o, indent) << "<key>kind</key>\n";
- Indent(o, indent) << "<string>"
- << (P.getKind() == PathDiagnosticPiece::Event
- ? "Event" : "ControlFlow")
- << "</string>\n";
+ Indent(o, indent) << "<string>";
+
+ switch (P.getKind()) {
+ case PathDiagnosticPiece::Event: o << "Event"; break;
+ case PathDiagnosticPiece::ControlFlow: o << "ControlFlow"; break;
+ case PathDiagnosticPiece::Macro: o << "Macro"; break;
+ }
+ o << "</string>\n";
// Finish up.