From c275f70bf94f25a2b1f92532e0e099f2738351d7 Mon Sep 17 00:00:00 2001
From: Steve Naroff <snaroff@apple.com>
Date: Sat, 5 Dec 2009 12:23:07 +0000
Subject: [PATCH] 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!

llvm-svn: 90664
---
 clang/include/clang/Basic/Diagnostic.h       | 4 ----
 clang/lib/Basic/Diagnostic.cpp               | 1 -
 clang/lib/Frontend/TextDiagnosticPrinter.cpp | 4 +---
 clang/tools/clang-cc/clang-cc.cpp            | 2 --
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/clang/include/clang/Basic/Diagnostic.h b/clang/include/clang/Basic/Diagnostic.h
index b9d19674af08..b2523f28d5e0 100644
--- a/clang/include/clang/Basic/Diagnostic.h
+++ b/clang/include/clang/Basic/Diagnostic.h
@@ -182,7 +182,6 @@ private:
   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 @@ public:
   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();
diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp
index 1f5179146b6b..8d0d81326db0 100644
--- a/clang/lib/Basic/Diagnostic.cpp
+++ b/clang/lib/Basic/Diagnostic.cpp
@@ -210,7 +210,6 @@ Diagnostic::Diagnostic(DiagnosticClient *client) : Client(client) {
   ErrorOccurred = false;
   FatalErrorOccurred = false;
   NumDiagnostics = 0;
-  LangOpts = 0;
   
   NumErrors = 0;
   CustomDiagInfo = 0;
diff --git a/clang/lib/Frontend/TextDiagnosticPrinter.cpp b/clang/lib/Frontend/TextDiagnosticPrinter.cpp
index eeca97d62a81..f8bb21ddee9f 100644
--- a/clang/lib/Frontend/TextDiagnosticPrinter.cpp
+++ b/clang/lib/Frontend/TextDiagnosticPrinter.cpp
@@ -655,9 +655,7 @@ void TextDiagnosticPrinter::HandleDiagnostic(Diagnostic::Level Level,
         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 {
diff --git a/clang/tools/clang-cc/clang-cc.cpp b/clang/tools/clang-cc/clang-cc.cpp
index fbc2847a9290..11a4f2427377 100644
--- a/clang/tools/clang-cc/clang-cc.cpp
+++ b/clang/tools/clang-cc/clang-cc.cpp
@@ -236,8 +236,6 @@ int main(int argc, char **argv) {
   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.