When using the dead-stores checker with the BugReporter class, properly capture the diagnostic associated with a specific warning and emit it.

llvm-svn: 52565

1 files changed, 8 insertions, 3 deletions

diff --git a/clang/lib/Analysis/DeadStores.cpp b/clang/lib/Analysis/DeadStores.cpp
index 7d912b046eb..208e66f3e96 100644
--- a/clang/lib/Analysis/DeadStores.cpp
+++ b/clang/lib/Analysis/DeadStores.cpp
@@ -164,13 +164,18 @@ namespace {
 class VISIBILITY_HIDDEN DiagBugReport : public RangedBugReport {
   std::list<std::string> Strs;
   FullSourceLoc L;
+  const char* description;
 public:
-  DiagBugReport(BugType& D, FullSourceLoc l) :
-    RangedBugReport(D, NULL), L(l) {}
+  DiagBugReport(const char* desc, BugType& D, FullSourceLoc l) :
+    RangedBugReport(D, NULL), L(l), description(desc) {}
   
   virtual ~DiagBugReport() {}
   virtual FullSourceLoc getLocation(SourceManager&) { return L; }
   
+  virtual const char* getDescription() const {
+    return description;
+  }
+  
   void addString(const std::string& s) { Strs.push_back(s); }  
   
   typedef std::list<std::string>::const_iterator str_iterator;
@@ -198,7 +203,7 @@ public:
     // FIXME: Use a map from diag::kind to BugType, instead of having just
     //  one BugType.
     
-    Reports.push_back(DiagBugReport(D, Pos));
+    Reports.push_back(DiagBugReport(Diags.getDescription(ID), D, Pos));
     DiagBugReport& R = Reports.back();
     
     for ( ; NumRanges ; --NumRanges, ++Ranges)