introduce the one true Diag method for Sema. Next up: kill all the others off.

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

2 files changed, 5 insertions, 6 deletions

diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index c064e2448b..00ad949fb0 100644
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp
@@ -168,9 +168,9 @@ void Sema::ActOnEndOfTranslationUnit() {
 // Helper functions.
 //===----------------------------------------------------------------------===//
 
-bool Sema::Diag(SourceLocation Loc, unsigned DiagID) {
-  PP.getDiagnostics().Report(PP.getFullLoc(Loc), DiagID);
-  return true;
+DiagnosticInfo Sema::Diag(SourceLocation Loc, unsigned DiagID) {
+  return PP.getDiagnostics().Report(FullSourceLoc(Loc, PP.getSourceManager()),
+                                    DiagID);
 }
 
 bool Sema::Diag(SourceLocation Loc, unsigned DiagID, const std::string &Msg) {
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 66c0138614..014565dea4 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -237,9 +237,8 @@ public:
   
   const LangOptions &getLangOptions() const;
   
-  /// The primitive diagnostic helpers - always returns true, which simplifies 
-  /// error handling (i.e. less code).
-  bool Diag(SourceLocation Loc, unsigned DiagID);
+  /// The primitive diagnostic helpers.
+  DiagnosticInfo Diag(SourceLocation Loc, unsigned DiagID);
   bool Diag(SourceLocation Loc, unsigned DiagID, const std::string &Msg);
   bool Diag(SourceLocation Loc, unsigned DiagID, const std::string &Msg1,
             const std::string &Msg2);