From 0df8cc233dadf5c91442bd9273e2975838bbc0ea Mon Sep 17 00:00:00 2001 From: "dkegel@google.com" Date: Thu, 3 Sep 2009 19:54:28 +0000 Subject: Update to valgrind-3.5.0. From timur, http://codereview.chromium.org/190008 Also use it if present. Especially use its new xml suppression record if present, which is more correct than the one we synthesize. Also fix a warning about global use before declare in memcheck_analyze.py. Review URL: http://codereview.chromium.org/191006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25353 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/valgrind/possible.patch | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'tools/valgrind/possible.patch') diff --git a/tools/valgrind/possible.patch b/tools/valgrind/possible.patch index 1091844..b5e4841 100644 --- a/tools/valgrind/possible.patch +++ b/tools/valgrind/possible.patch @@ -1,6 +1,6 @@ Index: memcheck/mc_main.c =================================================================== ---- memcheck/mc_main.c (revision 10771) +--- memcheck/mc_main.c (revision 10880) +++ memcheck/mc_main.c (working copy) @@ -4658,6 +4658,7 @@ LeakCheckMode MC_(clo_leak_check) = LC_Summary; @@ -28,9 +28,9 @@ Index: memcheck/mc_main.c " --partial-loads-ok=no|yes too hard to explain here; see manual [no]\n" Index: memcheck/mc_include.h =================================================================== ---- memcheck/mc_include.h (revision 10771) +--- memcheck/mc_include.h (revision 10880) +++ memcheck/mc_include.h (working copy) -@@ -394,6 +394,9 @@ +@@ -395,6 +395,9 @@ /* In leak check, show reachable-but-not-freed blocks? default: NO */ extern Bool MC_(clo_show_reachable); @@ -42,19 +42,15 @@ Index: memcheck/mc_include.h extern Bool MC_(clo_workaround_gcc296_bugs); Index: memcheck/mc_leakcheck.c =================================================================== ---- memcheck/mc_leakcheck.c (revision 10771) +--- memcheck/mc_leakcheck.c (revision 10880) +++ memcheck/mc_leakcheck.c (working copy) -@@ -843,7 +843,7 @@ - // - lr = lr_array[i]; - count_as_error = Unreached == lr->key.state || -- Possible == lr->key.state; -+ (MC_(clo_show_possible) && Possible == lr->key.state); +@@ -845,7 +845,8 @@ print_record = is_full_check && - ( MC_(clo_show_reachable) || count_as_error ); - is_suppressed = -@@ -1113,4 +1113,3 @@ - /*--------------------------------------------------------------------*/ - /*--- end ---*/ - /*--------------------------------------------------------------------*/ -- + ( MC_(clo_show_reachable) || + Unreached == lr->key.state || +- Possible == lr->key.state ); ++ ( MC_(clo_show_possible) && ++ Possible == lr->key.state ) ); + // We don't count a leaks as errors with --leak-check=summary. + // Otherwise you can get high error counts with few or no error + // messages, which can be confusing. Also, you could argue that -- cgit v1.1