Vendor import of clang trunk r130700:

http://llvm.org/svn/llvm-project/cfe/trunk@130700

1 files changed, 7 insertions, 1 deletions

diff --git a/include/clang/Frontend/DiagnosticOptions.h b/include/clang/Frontend/DiagnosticOptions.h
index f7f498b..ff92058 100644
--- a/include/clang/Frontend/DiagnosticOptions.h
+++ b/include/clang/Frontend/DiagnosticOptions.h
@@ -31,8 +31,10 @@ public:
   unsigned ShowFixits : 1;       /// Show fixit information.
   unsigned ShowSourceRanges : 1; /// Show source ranges in numeric form.
   unsigned ShowParseableFixits : 1; /// Show machine parseable fix-its.
-  unsigned ShowOptionNames : 1;  /// Show the diagnostic name for mappable
+  unsigned ShowNames : 1;        /// Show the diagnostic name
+  unsigned ShowOptionNames : 1;  /// Show the option name for mappable
                                  /// diagnostics.
+  unsigned ShowNoteIncludeStack : 1; /// Show include stacks for notes.
   unsigned ShowCategories : 2;   /// Show categories: 0 -> none, 1 -> Number,
                                  /// 2 -> Full Name.
   unsigned ShowColors : 1;       /// Show diagnostics with ANSI color sequences.
@@ -60,6 +62,9 @@ public:
   /// testing and analysis.
   std::string DumpBuildInformation;
 
+  /// The file to log diagnostic output to.
+  std::string DiagnosticLogFile;
+
   /// The list of -W... options used to alter the diagnostic mappings, with the
   /// prefixes removed.
   std::vector<std::string> Warnings;
@@ -78,6 +83,7 @@ public:
     ShowColumn = 1;
     ShowFixits = 1;
     ShowLocation = 1;
+    ShowNames = 0;
     ShowOptionNames = 0;
     ShowCategories = 0;
     ShowSourceRanges = 0;