Update expected output

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11971 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/helgrind/tests/pth_barrier1.stderr.exp b/helgrind/tests/pth_barrier1.stderr.exp
index 64a193e..6412ee7 100644
--- a/helgrind/tests/pth_barrier1.stderr.exp
+++ b/helgrind/tests/pth_barrier1.stderr.exp
@@ -3,33 +3,33 @@
 Thread #x was created
    ...
    by 0x........: pthread_create@* (hg_intercepts.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:84)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:91)
+   by 0x........: main (pth_barrier.c:121)
 
 ---Thread-Announcement------------------------------------------
 
 Thread #x was created
    ...
    by 0x........: pthread_create@* (hg_intercepts.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:84)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:91)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 0 bytes inside a block of size 4 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
diff --git a/helgrind/tests/pth_barrier2.stderr.exp b/helgrind/tests/pth_barrier2.stderr.exp
index d45fad6..19f022a 100644
--- a/helgrind/tests/pth_barrier2.stderr.exp
+++ b/helgrind/tests/pth_barrier2.stderr.exp
@@ -3,622 +3,622 @@
 Thread #x was created
    ...
    by 0x........: pthread_create@* (hg_intercepts.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:84)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:91)
+   by 0x........: main (pth_barrier.c:121)
 
 ---Thread-Announcement------------------------------------------
 
 Thread #x was created
    ...
    by 0x........: pthread_create@* (hg_intercepts.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:84)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:91)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 0 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 4 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 8 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 12 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 16 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 20 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 24 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 28 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 32 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 36 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 40 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 44 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 48 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 52 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 56 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 60 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 64 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 68 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 72 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 76 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 80 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 84 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 88 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 92 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 96 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 100 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 104 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 108 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 112 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 116 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 120 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
 ----------------------------------------------------------------
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 124 bytes inside a block of size 128 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:75)
+   by 0x........: main (pth_barrier.c:121)
 
diff --git a/helgrind/tests/pth_barrier3.stderr.exp b/helgrind/tests/pth_barrier3.stderr.exp
index dba4bbd..3d6d083 100644
--- a/helgrind/tests/pth_barrier3.stderr.exp
+++ b/helgrind/tests/pth_barrier3.stderr.exp
@@ -16,18 +16,18 @@
 
 Possible data race during write of size 4 at 0x........ by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 This conflicts with a previous write of size 4 by thread #x
 Locks held: none
-   at 0x........: threadfunc (pth_barrier.c:57)
+   at 0x........: threadfunc (pth_barrier.c:59)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    ...
 
 Address 0x........ is 0 bytes inside a block of size 4 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: barriers_and_races (pth_barrier.c:72)
-   by 0x........: main (pth_barrier.c:107)
+   by 0x........: barriers_and_races (pth_barrier.c:107)
+   by 0x........: main (pth_barrier.c:121)