|
From: <sv...@va...> - 2006-12-26 03:17:50
|
Author: sewardj
Date: 2006-12-26 03:17:44 +0000 (Tue, 26 Dec 2006)
New Revision: 6428
Log:
Merge r6377/8: --gen-suppressions fixes (fix for #136844, #138507)
Modified:
branches/VALGRIND_3_2_BRANCH/coregrind/m_errormgr.c
branches/VALGRIND_3_2_BRANCH/memcheck/mc_main.c
Modified: branches/VALGRIND_3_2_BRANCH/coregrind/m_errormgr.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/coregrind/m_errormgr.c 2006-12-26 03:13:=
14 UTC (rev 6427)
+++ branches/VALGRIND_3_2_BRANCH/coregrind/m_errormgr.c 2006-12-26 03:17:=
44 UTC (rev 6428)
@@ -386,7 +386,7 @@
{
static UChar buf[ERRTXT_LEN];
=20
- 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);
Modified: branches/VALGRIND_3_2_BRANCH/memcheck/mc_main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_2_BRANCH/memcheck/mc_main.c 2006-12-26 03:13:14 U=
TC (rev 6427)
+++ branches/VALGRIND_3_2_BRANCH/memcheck/mc_main.c 2006-12-26 03:17:44 U=
TC (rev 6428)
@@ -3025,7 +3025,7 @@
return (ekind =3D=3D FreeErr || ekind =3D=3D FreeMismatchErr);
=20
case OverlapSupp:
- return (ekind =3D OverlapErr);
+ return (ekind =3D=3D OverlapErr);
=20
case LeakSupp:
return (ekind =3D=3D LeakErr);
|