[cfe-commits] r90664 - in /cfe/trunk: include/clang/Basic/Diagnostic.h lib/Basic/Diagnostic.cpp lib/Frontend/TextDiagnosticPrinter.cpp tools/clang-cc/clang-cc.cpp

[Steve Naroff]

Author: snaroff
Date: Sat Dec  5 06:23:07 2009
New Revision: 90664

URL: http://llvm.org/viewvc/llvm-project?rev=90664&view=rev
Log:
Remove 'LangOpts' from Diagnostic (added in http://llvm.org/viewvc/llvm-project?view=rev&revision=90642).

Simply use the 'LangOpts' member already present in TextDiagnosticPrinter.

Sorry for the confusion!

Modified:
    cfe/trunk/include/clang/Basic/Diagnostic.h
    cfe/trunk/lib/Basic/Diagnostic.cpp
    cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp
    cfe/trunk/tools/clang-cc/clang-cc.cpp

Modified: cfe/trunk/include/clang/Basic/Diagnostic.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Diagnostic.h?rev=90664&r1=90663&r2=90664&view=diff

==============================================================================
--- cfe/trunk/include/clang/Basic/Diagnostic.h (original)
+++ cfe/trunk/include/clang/Basic/Diagnostic.h Sat Dec  5 06:23:07 2009
@@ -182,7 +182,6 @@
   bool SuppressAllDiagnostics;   // Suppress all diagnostics.
   ExtensionHandling ExtBehavior; // Map extensions onto warnings or errors?
   DiagnosticClient *Client;
-  LangOptions *LangOpts;
 
   /// DiagMappings - Mapping information for diagnostics.  Mapping info is
   /// packed into four bits per diagnostic.  The low three bits are the mapping
@@ -239,9 +238,6 @@
   DiagnosticClient *getClient() { return Client; }
   const DiagnosticClient *getClient() const { return Client; }
 
-  LangOptions *getLangOpts() const { return LangOpts; }
-  void setLangOpts(LangOptions *LOpts) { LangOpts = LOpts; }
-  
   /// pushMappings - Copies the current DiagMappings and pushes the new copy
   /// onto the top of the stack.
   void pushMappings();

Modified: cfe/trunk/lib/Basic/Diagnostic.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Diagnostic.cpp?rev=90664&r1=90663&r2=90664&view=diff

==============================================================================
--- cfe/trunk/lib/Basic/Diagnostic.cpp (original)
+++ cfe/trunk/lib/Basic/Diagnostic.cpp Sat Dec  5 06:23:07 2009
@@ -210,7 +210,6 @@
   ErrorOccurred = false;
   FatalErrorOccurred = false;
   NumDiagnostics = 0;
-  LangOpts = 0;
   
   NumErrors = 0;
   CustomDiagInfo = 0;

Modified: cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp?rev=90664&r1=90663&r2=90664&view=diff

==============================================================================
--- cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp (original)
+++ cfe/trunk/lib/Frontend/TextDiagnosticPrinter.cpp Sat Dec  5 06:23:07 2009
@@ -655,9 +655,7 @@
         OS.changeColor(savedColor, true);
       
       // Emit a Visual Studio compatible line number syntax.
-      // This check is a bit paranoid (in case LangOpts isn't set).
-      if (Info.getDiags() && Info.getDiags()->getLangOpts() &&
-          Info.getDiags()->getLangOpts()->Microsoft) {
+      if (LangOpts && LangOpts->Microsoft) {
         OS << PLoc.getFilename() << '(' << LineNo << ')';
         OS << " : ";
       } else {

Modified: cfe/trunk/tools/clang-cc/clang-cc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-cc/clang-cc.cpp?rev=90664&r1=90663&r2=90664&view=diff

==============================================================================
--- cfe/trunk/tools/clang-cc/clang-cc.cpp (original)
+++ cfe/trunk/tools/clang-cc/clang-cc.cpp Sat Dec  5 06:23:07 2009
@@ -236,8 +236,6 @@
   Clang.createDiagnostics(argc, argv);
   if (!Clang.hasDiagnostics())
     return 1;
-
-  Clang.getDiagnostics().setLangOpts(&Clang.getLangOpts());
   
   // Set an error handler, so that any LLVM backend diagnostics go through our
   // error handler.