Improve complaints. Enabled by VEX r2449.

Line numbers are still bad. But that is a GCC issue.

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

diff --git a/memcheck/tests/s390x/cu21.stderr.exp b/memcheck/tests/s390x/cu21.stderr.exp
index aef7459f709df4cba457c7d9a05cf4f7bce0054e..1b5bb188e1eb86998420539a6871f7fea06fb542 100644 (file)
--- a/memcheck/tests/s390x/cu21.stderr.exp
+++ b/memcheck/tests/s390x/cu21.stderr.exp
@@ -1,72 +1,60 @@
 Invalid write of size 2
-   at 0x........: do_cu21 (cu21.c:53)
+   at 0x........: do_cu21 (cu21.c:45)
    by 0x........: main (cu21.c:62)
  Address 0x........ is 0 bytes inside a block of size 1 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: main (cu21.c:62)
 
 Invalid write of size 2
-   at 0x........: do_cu21 (cu21.c:53)
+   at 0x........: do_cu21 (cu21.c:45)
    by 0x........: main (cu21.c:68)
  Address 0x........ is 0 bytes inside a block of size 1 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: main (cu21.c:68)
 
 Invalid write of size 1
-   at 0x........: do_cu21 (cu21.c:53)
+   at 0x........: do_cu21 (cu21.c:45)
    by 0x........: main (cu21.c:68)
  Address 0x........ is 1 bytes after a block of size 1 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: main (cu21.c:68)
 
 Invalid write of size 1
-   at 0x........: do_cu21 (cu21.c:53)
+   at 0x........: do_cu21 (cu21.c:45)
    by 0x........: main (cu21.c:71)
  Address 0x........ is 0 bytes after a block of size 2 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: main (cu21.c:71)
 
 Invalid write of size 4
-   at 0x........: do_cu21 (cu21.c:53)
+   at 0x........: do_cu21 (cu21.c:45)
    by 0x........: main (cu21.c:77)
  Address 0x........ is 0 bytes inside a block of size 1 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: main (cu21.c:77)
 
 Invalid write of size 4
-   at 0x........: do_cu21 (cu21.c:53)
+   at 0x........: do_cu21 (cu21.c:45)
    by 0x........: main (cu21.c:80)
  Address 0x........ is 0 bytes inside a block of size 2 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: main (cu21.c:80)
 
 Invalid write of size 4
-   at 0x........: do_cu21 (cu21.c:53)
+   at 0x........: do_cu21 (cu21.c:45)
    by 0x........: main (cu21.c:83)
  Address 0x........ is 0 bytes inside a block of size 3 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: main (cu21.c:83)
 
-Conditional jump or move depends on uninitialised value(s)
-   at 0x........: do_cu21 (cu21.c:53)
-   by 0x........: main (cu21.c:94)
-
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: do_cu21 (cu21.c:45)
    by 0x........: main (cu21.c:94)
 
-Conditional jump or move depends on uninitialised value(s)
-   at 0x........: do_cu21 (cu21.c:53)
-   by 0x........: main (cu21.c:99)
-
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: do_cu21 (cu21.c:45)
    by 0x........: main (cu21.c:99)
 
-Conditional jump or move depends on uninitialised value(s)
-   at 0x........: do_cu21 (cu21.c:53)
-   by 0x........: main (cu21.c:104)
-
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: do_cu21 (cu21.c:45)
    by 0x........: main (cu21.c:104)