From b0ee68529f53bd0e3a7d0ddbe6ef778f712ddf1d Mon Sep 17 00:00:00 2001 From: Florian Krohm Date: Wed, 26 Oct 2011 15:27:41 +0000 Subject: [PATCH] Give function copy_input_until_stop the noinline atribute. At least one of the compilers for s390x nightly builds was inlining it. Update exp files accoordingly. This should fix any residual back-trace noise for this testcase. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12235 --- memcheck/tests/origin5-bz2.c | 2 +- memcheck/tests/origin5-bz2.stderr.exp-glibc212-s390x | 9 ++++++--- memcheck/tests/origin5-bz2.stderr.exp-glibc25-amd64 | 9 ++++++--- memcheck/tests/origin5-bz2.stderr.exp-glibc25-x86 | 9 ++++++--- memcheck/tests/origin5-bz2.stderr.exp-glibc27-ppc64 | 9 ++++++--- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/memcheck/tests/origin5-bz2.c b/memcheck/tests/origin5-bz2.c index 7c79882d2..45006ebcc 100644 --- a/memcheck/tests/origin5-bz2.c +++ b/memcheck/tests/origin5-bz2.c @@ -4651,7 +4651,7 @@ void flush_RL ( EState* s ) /*---------------------------------------------------*/ -static +static __attribute__((noinline)) Bool copy_input_until_stop ( EState* s ) { Bool progress_in = False; diff --git a/memcheck/tests/origin5-bz2.stderr.exp-glibc212-s390x b/memcheck/tests/origin5-bz2.stderr.exp-glibc212-s390x index ae0af5d4e..bc2124524 100644 --- a/memcheck/tests/origin5-bz2.stderr.exp-glibc212-s390x +++ b/memcheck/tests/origin5-bz2.stderr.exp-glibc212-s390x @@ -4,7 +4,8 @@ Conditional jump or move depends on uninitialised value(s) at 0x........: main (origin5-bz2.c:6479) Conditional jump or move depends on uninitialised value(s) - at 0x........: handle_compress (origin5-bz2.c:4686) + at 0x........: copy_input_until_stop (origin5-bz2.c:4686) + by 0x........: handle_compress (origin5-bz2.c:4750) by 0x........: BZ2_bzCompress (origin5-bz2.c:4822) by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630) by 0x........: main (origin5-bz2.c:6484) @@ -12,7 +13,8 @@ Conditional jump or move depends on uninitialised value(s) at 0x........: main (origin5-bz2.c:6479) Use of uninitialised value of size 8 - at 0x........: handle_compress (origin5-bz2.c:4686) + at 0x........: copy_input_until_stop (origin5-bz2.c:4686) + by 0x........: handle_compress (origin5-bz2.c:4750) by 0x........: BZ2_bzCompress (origin5-bz2.c:4822) by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630) by 0x........: main (origin5-bz2.c:6484) @@ -20,7 +22,8 @@ Use of uninitialised value of size 8 at 0x........: main (origin5-bz2.c:6479) Use of uninitialised value of size 8 - at 0x........: handle_compress (origin5-bz2.c:4686) + at 0x........: copy_input_until_stop (origin5-bz2.c:4686) + by 0x........: handle_compress (origin5-bz2.c:4750) by 0x........: BZ2_bzCompress (origin5-bz2.c:4822) by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630) by 0x........: main (origin5-bz2.c:6484) diff --git a/memcheck/tests/origin5-bz2.stderr.exp-glibc25-amd64 b/memcheck/tests/origin5-bz2.stderr.exp-glibc25-amd64 index 32b90da60..ea6481dcd 100644 --- a/memcheck/tests/origin5-bz2.stderr.exp-glibc25-amd64 +++ b/memcheck/tests/origin5-bz2.stderr.exp-glibc25-amd64 @@ -4,7 +4,8 @@ Conditional jump or move depends on uninitialised value(s) at 0x........: main (origin5-bz2.c:6479) Conditional jump or move depends on uninitialised value(s) - at 0x........: handle_compress (origin5-bz2.c:4686) + at 0x........: copy_input_until_stop (origin5-bz2.c:4686) + by 0x........: handle_compress (origin5-bz2.c:4750) by 0x........: BZ2_bzCompress (origin5-bz2.c:4822) by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630) by 0x........: main (origin5-bz2.c:6484) @@ -12,7 +13,8 @@ Conditional jump or move depends on uninitialised value(s) at 0x........: main (origin5-bz2.c:6479) Use of uninitialised value of size 8 - at 0x........: handle_compress (origin5-bz2.c:4686) + at 0x........: copy_input_until_stop (origin5-bz2.c:4686) + by 0x........: handle_compress (origin5-bz2.c:4750) by 0x........: BZ2_bzCompress (origin5-bz2.c:4822) by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630) by 0x........: main (origin5-bz2.c:6484) @@ -20,7 +22,8 @@ Use of uninitialised value of size 8 at 0x........: main (origin5-bz2.c:6479) Use of uninitialised value of size 8 - at 0x........: handle_compress (origin5-bz2.c:4686) + at 0x........: copy_input_until_stop (origin5-bz2.c:4686) + by 0x........: handle_compress (origin5-bz2.c:4750) by 0x........: BZ2_bzCompress (origin5-bz2.c:4822) by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630) by 0x........: main (origin5-bz2.c:6484) diff --git a/memcheck/tests/origin5-bz2.stderr.exp-glibc25-x86 b/memcheck/tests/origin5-bz2.stderr.exp-glibc25-x86 index 1044e4a11..49e1b4c9c 100644 --- a/memcheck/tests/origin5-bz2.stderr.exp-glibc25-x86 +++ b/memcheck/tests/origin5-bz2.stderr.exp-glibc25-x86 @@ -4,7 +4,8 @@ Conditional jump or move depends on uninitialised value(s) at 0x........: main (origin5-bz2.c:6479) Conditional jump or move depends on uninitialised value(s) - at 0x........: handle_compress (origin5-bz2.c:4686) + at 0x........: copy_input_until_stop (origin5-bz2.c:4686) + by 0x........: handle_compress (origin5-bz2.c:4750) by 0x........: BZ2_bzCompress (origin5-bz2.c:4822) by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630) by 0x........: main (origin5-bz2.c:6484) @@ -12,7 +13,8 @@ Conditional jump or move depends on uninitialised value(s) at 0x........: main (origin5-bz2.c:6479) Use of uninitialised value of size 4 - at 0x........: handle_compress (origin5-bz2.c:4686) + at 0x........: copy_input_until_stop (origin5-bz2.c:4686) + by 0x........: handle_compress (origin5-bz2.c:4750) by 0x........: BZ2_bzCompress (origin5-bz2.c:4822) by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630) by 0x........: main (origin5-bz2.c:6484) @@ -20,7 +22,8 @@ Use of uninitialised value of size 4 at 0x........: main (origin5-bz2.c:6479) Use of uninitialised value of size 4 - at 0x........: handle_compress (origin5-bz2.c:4686) + at 0x........: copy_input_until_stop (origin5-bz2.c:4686) + by 0x........: handle_compress (origin5-bz2.c:4750) by 0x........: BZ2_bzCompress (origin5-bz2.c:4822) by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630) by 0x........: main (origin5-bz2.c:6484) diff --git a/memcheck/tests/origin5-bz2.stderr.exp-glibc27-ppc64 b/memcheck/tests/origin5-bz2.stderr.exp-glibc27-ppc64 index e0958e4b8..cd1a70d30 100644 --- a/memcheck/tests/origin5-bz2.stderr.exp-glibc27-ppc64 +++ b/memcheck/tests/origin5-bz2.stderr.exp-glibc27-ppc64 @@ -4,7 +4,8 @@ Conditional jump or move depends on uninitialised value(s) at 0x........: main (origin5-bz2.c:6481) Conditional jump or move depends on uninitialised value(s) - at 0x........: handle_compress (origin5-bz2.c:4686) + at 0x........: copy_input_until_stop (origin5-bz2.c:4686) + by 0x........: handle_compress (origin5-bz2.c:4750) by 0x........: BZ2_bzCompress (origin5-bz2.c:4822) by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630) by 0x........: main (origin5-bz2.c:6484) @@ -12,7 +13,8 @@ Conditional jump or move depends on uninitialised value(s) at 0x........: main (origin5-bz2.c:6481) Use of uninitialised value of size 8 - at 0x........: handle_compress (origin5-bz2.c:4686) + at 0x........: copy_input_until_stop (origin5-bz2.c:4686) + by 0x........: handle_compress (origin5-bz2.c:4750) by 0x........: BZ2_bzCompress (origin5-bz2.c:4822) by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630) by 0x........: main (origin5-bz2.c:6484) @@ -20,7 +22,8 @@ Use of uninitialised value of size 8 at 0x........: main (origin5-bz2.c:6481) Use of uninitialised value of size 8 - at 0x........: handle_compress (origin5-bz2.c:4686) + at 0x........: copy_input_until_stop (origin5-bz2.c:4686) + by 0x........: handle_compress (origin5-bz2.c:4750) by 0x........: BZ2_bzCompress (origin5-bz2.c:4822) by 0x........: BZ2_bzBuffToBuffCompress (origin5-bz2.c:5630) by 0x........: main (origin5-bz2.c:6484)