Attempt to reduce output variance by ensuring mainSort() is never inlined.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8744

diff --git a/memcheck/tests/origin5-bz2.c b/memcheck/tests/origin5-bz2.c
index d56cb4306aae685b9ebfff0e58612003e6a6e796..4d90fef3157a17e9eacb6f3ebbaff61e475e5745 100644 (file)
--- a/memcheck/tests/origin5-bz2.c
+++ b/memcheck/tests/origin5-bz2.c
@@ -2784,7 +2784,7 @@ void mainQSort3 ( UInt32* ptr,
 #define SETMASK (1 << 21)
 #define CLEARMASK (~(SETMASK))
 
-static
+static __attribute__((noinline))
 void mainSort ( UInt32* ptr, 
                 UChar*  block,
                 UInt16* quadrant, 

diff --git a/memcheck/tests/origin5-bz2.stderr.exp-glibc25-amd64 b/memcheck/tests/origin5-bz2.stderr.exp-glibc25-amd64
index b4bd29061fe5367626c06f7f5431ed7bd389e7ac..4c8630e2c998433259dd15a44fc0f6512152e628 100644 (file)
--- a/memcheck/tests/origin5-bz2.stderr.exp-glibc25-amd64
+++ b/memcheck/tests/origin5-bz2.stderr.exp-glibc25-amd64
@@ -28,7 +28,8 @@ Use of uninitialised value of size 8
    at 0x........: main (origin5-bz2.c:6479)
 
 Use of uninitialised value of size 8
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2820)
+   at 0x........: mainSort (origin5-bz2.c:2820)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
    by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
    by 0x........: handle_compress (origin5-bz2.c:4753)
    by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -38,7 +39,8 @@ Use of uninitialised value of size 8
    at 0x........: main (origin5-bz2.c:6479)
 
 Use of uninitialised value of size 8
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2823)
+   at 0x........: mainSort (origin5-bz2.c:2823)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
    by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
    by 0x........: handle_compress (origin5-bz2.c:4753)
    by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -48,7 +50,8 @@ Use of uninitialised value of size 8
    at 0x........: main (origin5-bz2.c:6479)
 
 Use of uninitialised value of size 8
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2854)
+   at 0x........: mainSort (origin5-bz2.c:2854)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
    by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
    by 0x........: handle_compress (origin5-bz2.c:4753)
    by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -58,7 +61,8 @@ Use of uninitialised value of size 8
    at 0x........: main (origin5-bz2.c:6479)
 
 Use of uninitialised value of size 8
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2858)
+   at 0x........: mainSort (origin5-bz2.c:2858)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
    by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
    by 0x........: handle_compress (origin5-bz2.c:4753)
    by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -68,7 +72,8 @@ Use of uninitialised value of size 8
    at 0x........: main (origin5-bz2.c:6479)
 
 Use of uninitialised value of size 8
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2963)
+   at 0x........: mainSort (origin5-bz2.c:2963)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
    by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
    by 0x........: handle_compress (origin5-bz2.c:4753)
    by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)
@@ -78,7 +83,8 @@ Use of uninitialised value of size 8
    at 0x........: main (origin5-bz2.c:6479)
 
 Use of uninitialised value of size 8
-   at 0x........: BZ2_blockSort (origin5-bz2.c:2964)
+   at 0x........: mainSort (origin5-bz2.c:2964)
+   by 0x........: BZ2_blockSort (origin5-bz2.c:3105)
    by 0x........: BZ2_compressBlock (origin5-bz2.c:4034)
    by 0x........: handle_compress (origin5-bz2.c:4753)
    by 0x........: BZ2_bzCompress (origin5-bz2.c:4822)