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 2fb30f47281da0fb816f59506232dcc0f56f2c03..55c8e18f968454fece5ffb991e79d9dc0f2aee27 100644 (file)
--- 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 5fcc19a774e2b07f72b557f355a4cc94829a49fb..e2f5fb34429d9a5cbb040746675e3a83b33b0bea 100644 (file)
--- 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);