[2/4] analyzer: better logging for dedupe_winners::add

Message ID 20191217230137.31567-3-dmalcolm@redhat.com
State New
Headers show
Series
  • analyzer: Fixes for problems seen with CVE-2005-1689
Related show

Commit Message

David Malcolm Dec. 17, 2019, 11:01 p.m.
gcc/analyzer/ChangeLog:
	* diagnostic-manager.cc (dedupe_winners::add): Add logging
	of deduplication decisions made.
---
 gcc/analyzer/diagnostic-manager.cc | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

-- 
2.21.0

Patch

diff --git a/gcc/analyzer/diagnostic-manager.cc b/gcc/analyzer/diagnostic-manager.cc
index b8aae115ae67..47d32f4f4c6c 100644
--- a/gcc/analyzer/diagnostic-manager.cc
+++ b/gcc/analyzer/diagnostic-manager.cc
@@ -299,12 +299,19 @@  public:
     dedupe_key *key = new dedupe_key (sd, dc->get_path ());
     if (dedupe_candidate **slot = m_map.get (key))
       {
+	if (logger)
+	  logger->log ("already have this dedupe_key");
+
 	(*slot)->add_duplicate ();
 
 	if (dc->length () < (*slot)->length ())
 	  {
 	    /* We've got a shorter path for the key; replace
 	       the current candidate.  */
+	    if (logger)
+	      logger->log ("length %i is better than existing length %i;"
+			   " taking over this dedupe_key",
+			   dc->length (), (*slot)->length ());
 	    dc->m_num_dupes = (*slot)->get_num_dupes ();
 	    delete *slot;
 	    *slot = dc;
@@ -312,12 +319,22 @@  public:
 	else
 	  /* We haven't beaten the current best candidate;
 	     drop the new candidate.  */
-	  delete dc;
+	  {
+	    if (logger)
+	      logger->log ("length %i isn't better than existing length %i;"
+			   " dropping this candidate",
+			   dc->length (), (*slot)->length ());
+	    delete dc;
+	  }
 	delete key;
       }
     else
-      /* This is the first candidate for this key.  */
-      m_map.put (key, dc);
+      {
+	/* This is the first candidate for this key.  */
+	m_map.put (key, dc);
+	if (logger)
+	  logger->log ("first candidate for this dedupe_key");
+      }
   }
 
  /* Emit the simplest diagnostic within each set.  */