Have BugReporter::EmitWarning use the PathDiagnosticClient if it is available.

llvm-svn: 49668

1 files changed, 22 insertions, 10 deletions

diff --git a/clang/lib/Analysis/BugReporter.cpp b/clang/lib/Analysis/BugReporter.cpp
index 310fdc9accb..7572a556799 100644
--- a/clang/lib/Analysis/BugReporter.cpp
+++ b/clang/lib/Analysis/BugReporter.cpp
@@ -369,17 +369,29 @@ void BugReporter::EmitWarning(BugReport& R) {
   if (N && IsCached(N))
     return;
   
-  std::ostringstream os;
-  os << "[CHECKER] " << R.getDescription();
-  
-  unsigned ErrorDiag = Diag.getCustomDiagID(Diagnostic::Warning,
-                                            os.str().c_str());
-
-  // FIXME: Add support for multiple ranges.
-  
   FullSourceLoc L = R.getLocation(Ctx.getSourceManager());
-
+  
   const SourceRange *Beg, *End;
   R.getRanges(Beg, End);
-  Diag.Report(L, ErrorDiag, NULL, 0, Beg, End - Beg);
+  
+  if (!PD) {
+  
+    std::ostringstream os;
+    os << "[CHECKER] " << R.getDescription();
+    
+    unsigned ErrorDiag = Diag.getCustomDiagID(Diagnostic::Warning,
+                                              os.str().c_str());
+    
+    Diag.Report(L, ErrorDiag, NULL, 0, Beg, End - Beg);    
+  }
+  else {    
+    PathDiagnostic D(R.getName());
+    PathDiagnosticPiece* piece = new PathDiagnosticPiece(L, R.getDescription());
+    
+    for ( ; Beg != End; ++Beg)
+      piece->addRange(*Beg);
+    
+    D.push_back(piece);    
+    PD->HandlePathDiagnostic(D);
+  }
 }