From: Julian Seward <jseward@acm.org>
Date: Tue, 26 Dec 2006 03:17:44 +0000 (+0000)
Subject: Merge r6377/8: --gen-suppressions fixes (fix for #136844, #138507)
X-Git-Tag: svn/VALGRIND_3_2_2~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=978b74d312d4e9b042760b6c16880e8022001fa1;p=thirdparty%2Fvalgrind.git

Merge r6377/8: --gen-suppressions fixes (fix for #136844, #138507)


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6428
---

diff --git a/coregrind/m_errormgr.c b/coregrind/m_errormgr.c
index 2fb30f4728..55c8e18f96 100644
--- a/coregrind/m_errormgr.c
+++ b/coregrind/m_errormgr.c
@@ -386,7 +386,7 @@ static void printSuppForIp(UInt n, Addr ip)
 {
    static UChar buf[ERRTXT_LEN];
 
-   if ( VG_(get_fnname_nodemangle) (ip, buf,  ERRTXT_LEN) ) {
+   if ( VG_(get_fnname_Z_demangle_only) (ip, buf,  ERRTXT_LEN) ) {
       VG_(printf)("   fun:%s\n", buf);
    } else if ( VG_(get_objname)(ip, buf, ERRTXT_LEN) ) {
       VG_(printf)("   obj:%s\n", buf);
diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 5fcc19a774..e2f5fb3442 100644
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -3025,7 +3025,7 @@ static Bool mc_error_matches_suppression(Error* err, Supp* su)
          return (ekind == FreeErr || ekind == FreeMismatchErr);
 
       case OverlapSupp:
-         return (ekind = OverlapErr);
+         return (ekind == OverlapErr);
 
       case LeakSupp:
          return (ekind == LeakErr);