Don't compare actual addresses for FreeErr and FreeMismatchErr. Doing

so generates far too many duplicate errors in some circumstances.

MERGE TO HEAD

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_1_0_BRANCH@638

diff --git a/vg_errcontext.c b/vg_errcontext.c
index 52c7c6cdd420b48bb4c0c888ff29dbfc9e944a82..5ba77f78db239269bc604313590096b706596cc0 100644 (file)
--- a/vg_errcontext.c
+++ b/vg_errcontext.c
@@ -274,9 +274,14 @@ static Bool eq_ErrContext ( Bool cheap_addr_cmp,
          return True;
       case FreeErr:
       case FreeMismatchErr:
-         if (e1->addr != e2->addr) return False;
-         if (!eq_AddrInfo(cheap_addr_cmp, &e1->addrinfo, &e2->addrinfo)) 
-            return False;
+         /* JRS 2002-Aug-26: comparing addrs seems overkill and can
+            cause excessive duplication of errors.  Not even AddrErr
+            below does that.  So don't compare either the .addr field
+            or the .addrinfo fields. */
+         /* if (e1->addr != e2->addr) return False; */
+         /* if (!eq_AddrInfo(cheap_addr_cmp, &e1->addrinfo, &e2->addrinfo)) 
+               return False;
+         */
          return True;
       case AddrErr:
          if (e1->axskind != e2->axskind) return False;