[Valgrind-developers] [valgrind] Bugs 435732 and 403802 again

[Paul F. <pa...@so...>]

https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=39b4bbe3a1e48f9363351bc76f787b2c82a566b4

commit 39b4bbe3a1e48f9363351bc76f787b2c82a566b4
Author: Paul Floyd <pj...@wa...>
Date:   Sat Nov 13 12:31:41 2021 +0100

    Bugs 435732 and 403802 again
    
    This time with debuginfo removed.
    
    Also update the vgtest files for a couple of massif tests
    (and also the expected because of the commmand line change).
    Not yet tested these two with debuginfo installed.

Diff:
---
 massif/tests/new-cpp.post.exp        |  2 +-
 massif/tests/new-cpp.vgtest          |  1 +
 massif/tests/overloaded-new.post.exp |  2 +-
 massif/tests/overloaded-new.vgtest   |  1 +
 memcheck/tests/libstdc++.supp        | 23 +++++++++--------------
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/massif/tests/new-cpp.post.exp b/massif/tests/new-cpp.post.exp
index 9d90cf6c22..5935771617 100644
--- a/massif/tests/new-cpp.post.exp
+++ b/massif/tests/new-cpp.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./new-cpp
-Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook --ignore-fn=get_or_create_key_element --ignore-fn=_GLOBAL__sub_I_eh_alloc.cc --ignore-fn=call_init.part.0
+Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook --ignore-fn=get_or_create_key_element --ignore-fn=_GLOBAL__sub_I_eh_alloc.cc --ignore-fn=call_init.part.0 --ignore-fn=call_init
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 
diff --git a/massif/tests/new-cpp.vgtest b/massif/tests/new-cpp.vgtest
index 88bdf939b9..ebcef897a0 100644
--- a/massif/tests/new-cpp.vgtest
+++ b/massif/tests/new-cpp.vgtest
@@ -2,5 +2,6 @@ prog: new-cpp
 vgopts: --stacks=no --time-unit=B --massif-out-file=massif.out
 vgopts: --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook
 vgopts: --ignore-fn=get_or_create_key_element --ignore-fn=_GLOBAL__sub_I_eh_alloc.cc --ignore-fn=call_init.part.0
+vgopts: --ignore-fn=call_init
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out
diff --git a/massif/tests/overloaded-new.post.exp b/massif/tests/overloaded-new.post.exp
index e55885fc57..ae112710b7 100644
--- a/massif/tests/overloaded-new.post.exp
+++ b/massif/tests/overloaded-new.post.exp
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 Command:            ./overloaded-new
-Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook --ignore-fn=get_or_create_key_element --ignore-fn=_GLOBAL__sub_I_eh_alloc.cc --ignore-fn=call_init.part.0
+Massif arguments:   --stacks=no --time-unit=B --massif-out-file=massif.out --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook --ignore-fn=get_or_create_key_element --ignore-fn=_GLOBAL__sub_I_eh_alloc.cc --ignore-fn=call_init.part.0 --ignore-fn=call_init
 ms_print arguments: massif.out
 --------------------------------------------------------------------------------
 
diff --git a/massif/tests/overloaded-new.vgtest b/massif/tests/overloaded-new.vgtest
index 20bcd97e62..fc95acc2f3 100644
--- a/massif/tests/overloaded-new.vgtest
+++ b/massif/tests/overloaded-new.vgtest
@@ -2,5 +2,6 @@ prog: overloaded-new
 vgopts: --stacks=no --time-unit=B --massif-out-file=massif.out
 vgopts: --ignore-fn=__part_load_locale --ignore-fn=__time_load_locale --ignore-fn=dwarf2_unwind_dyld_add_image_hook
 vgopts: --ignore-fn=get_or_create_key_element --ignore-fn=_GLOBAL__sub_I_eh_alloc.cc --ignore-fn=call_init.part.0
+vgopts: --ignore-fn=call_init
 post: perl ../../massif/ms_print massif.out | ../../tests/filter_addresses
 cleanup: rm massif.out
diff --git a/memcheck/tests/libstdc++.supp b/memcheck/tests/libstdc++.supp
index 3cd2e628da..852d8ab0b6 100644
--- a/memcheck/tests/libstdc++.supp
+++ b/memcheck/tests/libstdc++.supp
@@ -52,26 +52,21 @@
 # All the following suppressions are variants of
 # _dl_init -> call_init which calls the DT_INIT_ARRAY functions
 
+# These suppressions are sensitive to changes to GCC and libstdc++
+# in order to generate a suppression stanza run
+#
+# /vg-in-place --gen-suppressions=all --show-reachable=yes --leak-check=full --run-cxx-freeres=no  memcheck/tests/leak_cpp_interior
+#
+# since leaks are ordered by increasing size the stanza to look for is the last one
+
+
 {
    malloc-leaks-cxx-stl-string-classes
    Memcheck:Leak
    match-leak-kinds: reachable
    fun:malloc
    obj:*lib*/libstdc++.so*
-   fun:call_init.part.0
-   fun:call_init
-   fun:_dl_init
-   obj:*lib*/ld-2.*.so
-}
-{
-   malloc-leaks-cxx-stl-string-classes-2
-   Memcheck:Leak
-   match-leak-kinds: reachable
-   fun:malloc
-   obj:*lib*/libstdc++.so*
-   fun:call_init.part.0
-   fun:_dl_init
-   obj:*lib*/ld-2.*.so
+   fun:call_init*
 }
 {
   malloc-leaks-cxx-stl-string-classes-debug