|
From: Mark W. <ma...@so...> - 2022-04-11 12:53:16
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=4c27f0f7649eb02336dcd0af9d2f8977b20d3a9f commit 4c27f0f7649eb02336dcd0af9d2f8977b20d3a9f Author: Mark Wielaard <ma...@kl...> Date: Mon Apr 11 14:45:49 2022 +0200 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: --- glibc-2.X-helgrind.supp.in | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/glibc-2.X-helgrind.supp.in b/glibc-2.X-helgrind.supp.in index 8e1a10fa55..0f76ad0e9a 100644 --- 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@ } |