Shuffle VerifyDiagnosticsClient API to be less fragile.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@88765 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 4 deletions

diff --git a/include/clang/Frontend/VerifyDiagnosticsClient.h b/include/clang/Frontend/VerifyDiagnosticsClient.h
index 3b841cb197..bac1ccf376 100644
--- a/include/clang/Frontend/VerifyDiagnosticsClient.h
+++ b/include/clang/Frontend/VerifyDiagnosticsClient.h
@@ -48,11 +48,10 @@ class TextDiagnosticBuffer;
 ///
 class VerifyDiagnosticsClient : public DiagnosticClient {
 public:
+  Diagnostic &Diags;
   llvm::OwningPtr<DiagnosticClient> PrimaryClient;
   llvm::OwningPtr<TextDiagnosticBuffer> Buffer;
   Preprocessor *CurrentPreprocessor;
-  Diagnostic *Diags;
-  SourceManager *SourceMgr;
   bool NumErrors;
 
 private:
@@ -63,14 +62,14 @@ public:
   /// PrimaryClient when a diagnostic does not match what is expected (as
   /// indicated in the source file). The verifying diagnostic client takes
   /// ownership of \arg PrimaryClient.
-  VerifyDiagnosticsClient(DiagnosticClient *PrimaryClient);
+  VerifyDiagnosticsClient(Diagnostic &Diags, DiagnosticClient *PrimaryClient);
   ~VerifyDiagnosticsClient();
 
   virtual void BeginSourceFile(const LangOptions &LangOpts,
                                const Preprocessor *PP);
 
   virtual void EndSourceFile();
-                               
+
   virtual void HandleDiagnostic(Diagnostic::Level DiagLevel,
                                 const DiagnosticInfo &Info);