Extend helgrind suppression for _IO_*xsputn* FILE* state manipulation

commit 7b5867b1f "helgrind reports false races for printfs using
mempcpy on FILE* state" extended the helgrind-glibc-io-xsputn
suppression by also covering mempcpy (instead of __GI_mempcpy).
The test added in that commit exposed a couple of other variants
of this suppression where _IO_*xsputn* called memcpy (instead of
mempcpy) and/or had an extra indirection/function in between.

Replace the two two suppressions with one that covers all cases
where _IO_*xsputn* *mem*cpy variants with possibly another ...
function in between.

https://bugs.kde.org/show_bug.cgi?id=450962

diff --git a/glibc-2.X-helgrind.supp.in b/glibc-2.X-helgrind.supp.in
index 8e1a10fa550153a6a1961c860c0f48ecfb7046ae..0f76ad0e9a2101afec0f744e141cc87c81cda9fa 100644 (file)
--- a/glibc-2.X-helgrind.supp.in
+++ b/glibc-2.X-helgrind.supp.in
@@ -49,15 +49,8 @@
 {
    helgrind-glibc-io-xsputn-mempcpy
    Helgrind:Race
-   fun:__GI_mempcpy
-   fun:_IO_*xsputn*
-   obj:@GLIBC_LIBC_PATH@
-}
-
-{
-   helgrind-glibc-io-xsputn-mempcpy-glibc2-26+
-   Helgrind:Race
-   fun:mempcpy
+   fun:*mem*cpy
+   ...
    fun:_IO_*xsputn*
    obj:@GLIBC_LIBC_PATH@
 }