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

diff --git a/memcheck/tests/origin5-bz2.c b/memcheck/tests/origin5-bz2.c
index 7c79882d29f7aed7527cadee004ff69402b47d99..45006ebcc82c500b7a351479cdc305e274a54efb 100644 (file)
--- 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 ae0af5d4e229dba07074ceb5276b4bf78f0673fb..bc2124524e89eecf7b020db55a1528fbc1f42d5c 100644 (file)
--- 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 32b90da60e0d263238eb4692782a9b5d4003fc6f..ea6481dcd88cb02658fd6847c54c5847f4fafb66 100644 (file)
--- 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 1044e4a1113ab4f87829a20285aa91f547d40f64..49e1b4c9c57616165bc9ab842ba747c79d2ecf71 100644 (file)
--- 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 e0958e4b8bf5d9f097d5b4db616e27668298c544..cd1a70d30a4e2c4ab020424c6d6e5f406d10792b 100644 (file)
--- 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)