diff options
| author | Sverker Eriksson <[email protected]> | 2012-10-17 16:39:13 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-10-17 16:39:13 +0200 |
| commit | 82b4ab629afa1bb1031a885d02a1bf44878df5dd (patch) | |
| tree | 003e8d0fa3b43e294a37554de8cfdcd119e44833 | |
| parent | 34e771ac00207aafe958eef1e5b424ee8a08a3d9 (diff) | |
| download | otp-82b4ab629afa1bb1031a885d02a1bf44878df5dd.tar.gz otp-82b4ab629afa1bb1031a885d02a1bf44878df5dd.tar.bz2 otp-82b4ab629afa1bb1031a885d02a1bf44878df5dd.zip | |
erts: Expand valgrind suppression for zlib
to work even when compiler does aggressive function inlining
| -rw-r--r-- | erts/emulator/valgrind/suppress.patched.3.6.0 | 12 | ||||
| -rw-r--r-- | erts/emulator/valgrind/suppress.standard | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/erts/emulator/valgrind/suppress.patched.3.6.0 b/erts/emulator/valgrind/suppress.patched.3.6.0 index 62ba032520..766ea3b8ab 100644 --- a/erts/emulator/valgrind/suppress.patched.3.6.0 +++ b/erts/emulator/valgrind/suppress.patched.3.6.0 @@ -133,26 +133,18 @@ fun:pthread_create@@GLIBC_2.2.5 { zlib; ok according to zlib developers Memcheck:Cond -fun:longest_match +... fun:deflate_slow fun:deflate } { zlib; ok according to zlib developers Memcheck:Cond -fun:longest_match +... fun:deflate_fast fun:deflate } { -zlib; ok accordnig to zlib (this one popped up with valgrind-3.6.0) -Memcheck:Cond -fun:deflate_slow -fun:deflate -fun:zlib_deflate -fun:zlib_ctl -} -{ No leak; pointer into block Memcheck:Leak fun:malloc diff --git a/erts/emulator/valgrind/suppress.standard b/erts/emulator/valgrind/suppress.standard index 5a129bfd10..2451ca7a8d 100644 --- a/erts/emulator/valgrind/suppress.standard +++ b/erts/emulator/valgrind/suppress.standard @@ -120,14 +120,14 @@ fun:pthread_create@@GLIBC_2.2.5 { zlib; ok according to zlib developers Memcheck:Cond -fun:longest_match +... fun:deflate_slow fun:deflate } { zlib; ok according to zlib developers Memcheck:Cond -fun:longest_match +... fun:deflate_fast fun:deflate } |