From ab15e7bf2a20ba43cfaffa0fa491e0a8752435c5 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 22 Feb 2006 19:47:10 +0000 Subject: [PATCH] backport the "(below main)" backtrace fix to reduce regression failures on PPC32 git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_1_BRANCH@5692 --- coregrind/m_demangle/demangle.c | 7 +++++++ memcheck/tests/badjump.stderr.exp | 4 ++-- memcheck/tests/badjump2.stderr.exp | 2 +- memcheck/tests/buflen_check.stderr.exp2 | 4 ++-- memcheck/tests/execve.stderr.exp2 | 6 +++--- memcheck/tests/execve2.stderr.exp2 | 2 +- memcheck/tests/fwrite.stderr.exp | 2 +- memcheck/tests/x86/scalar_exit_group.stderr.exp | 2 +- memcheck/tests/xml1.stderr.exp | 2 +- none/tests/fdleak_creat.stderr.exp | 2 +- none/tests/fdleak_dup.stderr.exp | 4 ++-- none/tests/fdleak_dup2.stderr.exp | 6 +++--- none/tests/fdleak_fcntl.stderr.exp | 2 +- none/tests/fdleak_open.stderr.exp | 2 +- none/tests/fdleak_pipe.stderr.exp | 4 ++-- none/tests/fdleak_socketpair.stderr.exp | 4 ++-- 16 files changed, 31 insertions(+), 24 deletions(-) diff --git a/coregrind/m_demangle/demangle.c b/coregrind/m_demangle/demangle.c index 82f8e1803b..686a9282e3 100644 --- a/coregrind/m_demangle/demangle.c +++ b/coregrind/m_demangle/demangle.c @@ -58,6 +58,13 @@ void VG_(demangle) ( Char* orig, Char* result, Int result_size ) // does leak. But, we can't do much about it, and it's not a disaster, // so we just let it slide without aborting or telling the user. + // Finally, to reduce the endless nuisance of multiple different names + // for "the frame below main()" screwing up the testsuite, change all + // known incarnations of said into a single name, "(below main)". + if (0==VG_(strcmp)("__libc_start_main", result) + || 0==VG_(strcmp)("generic_start_main", result)) + VG_(strncpy_safely)(result, "(below main)", 13); + VGP_POPCC(VgpDemangle); } diff --git a/memcheck/tests/badjump.stderr.exp b/memcheck/tests/badjump.stderr.exp index 74c7dde7de..6e723e558f 100644 --- a/memcheck/tests/badjump.stderr.exp +++ b/memcheck/tests/badjump.stderr.exp @@ -1,13 +1,13 @@ Jump to the invalid address stated on the next line at 0x........: ??? - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Address 0x........ is not stack'd, malloc'd or (recently) free'd Process terminating with default action of signal 11 (SIGSEGV) Access not within mapped region at address 0x........ at 0x........: ??? - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0) malloc/free: in use at exit: 0 bytes in 0 blocks. diff --git a/memcheck/tests/badjump2.stderr.exp b/memcheck/tests/badjump2.stderr.exp index 741ad1e960..ba25995988 100644 --- a/memcheck/tests/badjump2.stderr.exp +++ b/memcheck/tests/badjump2.stderr.exp @@ -1,5 +1,5 @@ Jump to the invalid address stated on the next line at 0x........: ??? - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Address 0x........ is not stack'd, malloc'd or (recently) free'd Signal caught, as expected diff --git a/memcheck/tests/buflen_check.stderr.exp2 b/memcheck/tests/buflen_check.stderr.exp2 index cea97f6b45..a8f33873ce 100644 --- a/memcheck/tests/buflen_check.stderr.exp2 +++ b/memcheck/tests/buflen_check.stderr.exp2 @@ -1,11 +1,11 @@ Syscall param socketcall.getsockname(name) points to unaddressable byte(s) at 0x........: getsockname (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Address 0x........ is not stack'd, malloc'd or (recently) free'd Syscall param socketcall.getsockname(namelen_in) points to unaddressable byte(s) at 0x........: getsockname (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Address 0x........ is not stack'd, malloc'd or (recently) free'd getsockname(1) failed getsockname(2) failed diff --git a/memcheck/tests/execve.stderr.exp2 b/memcheck/tests/execve.stderr.exp2 index e059ba89d9..0fa0337ed0 100644 --- a/memcheck/tests/execve.stderr.exp2 +++ b/memcheck/tests/execve.stderr.exp2 @@ -1,14 +1,14 @@ Syscall param execve(filename) points to unaddressable byte(s) at 0x........: execve (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Address 0x........ is not stack'd, malloc'd or (recently) free'd Syscall param execve(argv[i]) points to unaddressable byte(s) at 0x........: execve (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Address 0x........ is not stack'd, malloc'd or (recently) free'd Syscall param execve(envp[i]) points to unaddressable byte(s) at 0x........: execve (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Address 0x........ is not stack'd, malloc'd or (recently) free'd diff --git a/memcheck/tests/execve2.stderr.exp2 b/memcheck/tests/execve2.stderr.exp2 index 0ebfc10937..8168de1295 100644 --- a/memcheck/tests/execve2.stderr.exp2 +++ b/memcheck/tests/execve2.stderr.exp2 @@ -1,4 +1,4 @@ Syscall param execve(filename) points to unaddressable byte(s) at 0x........: execve (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Address 0x........ is not stack'd, malloc'd or (recently) free'd diff --git a/memcheck/tests/fwrite.stderr.exp b/memcheck/tests/fwrite.stderr.exp index cb9d687318..3dc924feb1 100644 --- a/memcheck/tests/fwrite.stderr.exp +++ b/memcheck/tests/fwrite.stderr.exp @@ -1,6 +1,6 @@ Syscall param write(buf) points to uninitialised byte(s) at 0x........: write (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Address 0x........ is 0 bytes inside a block of size 10 alloc'd at 0x........: malloc (vg_replace_malloc.c:...) by 0x........: main (fwrite.c:7) diff --git a/memcheck/tests/x86/scalar_exit_group.stderr.exp b/memcheck/tests/x86/scalar_exit_group.stderr.exp index cbef1234ff..7347116123 100644 --- a/memcheck/tests/x86/scalar_exit_group.stderr.exp +++ b/memcheck/tests/x86/scalar_exit_group.stderr.exp @@ -3,4 +3,4 @@ ----------------------------------------------------- Syscall param exit_group(exit_code) contains uninitialised byte(s) at 0x........: syscall (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) diff --git a/memcheck/tests/xml1.stderr.exp b/memcheck/tests/xml1.stderr.exp index 7b532335db..0657a38a87 100644 --- a/memcheck/tests/xml1.stderr.exp +++ b/memcheck/tests/xml1.stderr.exp @@ -351,7 +351,7 @@ 0x........ ... - __libc_start_main + (below main) diff --git a/none/tests/fdleak_creat.stderr.exp b/none/tests/fdleak_creat.stderr.exp index 766a979f19..b35d8ffc9f 100644 --- a/none/tests/fdleak_creat.stderr.exp +++ b/none/tests/fdleak_creat.stderr.exp @@ -4,7 +4,7 @@ FILE DESCRIPTORS: 4 open at exit. Open file descriptor .: /tmp/file at 0x........: creat (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Open file descriptor .: . diff --git a/none/tests/fdleak_dup.stderr.exp b/none/tests/fdleak_dup.stderr.exp index d040fdd58c..4e9b9fbc96 100644 --- a/none/tests/fdleak_dup.stderr.exp +++ b/none/tests/fdleak_dup.stderr.exp @@ -3,11 +3,11 @@ FILE DESCRIPTORS: 5 open at exit. Open file descriptor .: /dev/null at 0x........: dup (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Open file descriptor .: /dev/null at 0x........: open (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Open file descriptor .: . diff --git a/none/tests/fdleak_dup2.stderr.exp b/none/tests/fdleak_dup2.stderr.exp index 75dad558d4..bb0dafcd05 100644 --- a/none/tests/fdleak_dup2.stderr.exp +++ b/none/tests/fdleak_dup2.stderr.exp @@ -3,15 +3,15 @@ FILE DESCRIPTORS: 6 open at exit. Open file descriptor .: /dev/null at 0x........: dup2 (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Open file descriptor .: /dev/null at 0x........: dup2 (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Open file descriptor .: /dev/null at 0x........: open (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Open file descriptor .: . diff --git a/none/tests/fdleak_fcntl.stderr.exp b/none/tests/fdleak_fcntl.stderr.exp index a4719a4b19..f5b799bfc8 100644 --- a/none/tests/fdleak_fcntl.stderr.exp +++ b/none/tests/fdleak_fcntl.stderr.exp @@ -7,7 +7,7 @@ Open file descriptor .: /dev/null Open file descriptor .: /dev/null at 0x........: open (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Open file descriptor .: . diff --git a/none/tests/fdleak_open.stderr.exp b/none/tests/fdleak_open.stderr.exp index 1d9c2b266c..85b3504b31 100644 --- a/none/tests/fdleak_open.stderr.exp +++ b/none/tests/fdleak_open.stderr.exp @@ -3,7 +3,7 @@ FILE DESCRIPTORS: 4 open at exit. Open file descriptor .: /dev/null at 0x........: open (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Open file descriptor .: . diff --git a/none/tests/fdleak_pipe.stderr.exp b/none/tests/fdleak_pipe.stderr.exp index dc92a37358..2457340c86 100644 --- a/none/tests/fdleak_pipe.stderr.exp +++ b/none/tests/fdleak_pipe.stderr.exp @@ -3,11 +3,11 @@ FILE DESCRIPTORS: 5 open at exit. Open file descriptor .: at 0x........: pipe (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Open file descriptor .: at 0x........: pipe (in /...libc...) - by 0x........: __libc_start_main (in /...libc...) + by 0x........: (below main) (in /...libc...) Open file descriptor .: . diff --git a/none/tests/fdleak_socketpair.stderr.exp b/none/tests/fdleak_socketpair.stderr.exp index 2075bade17..0b838b9dc2 100644 --- a/none/tests/fdleak_socketpair.stderr.exp +++ b/none/tests/fdleak_socketpair.stderr.exp @@ -3,11 +3,11 @@ FILE DESCRIPTORS: 5 open at exit. Open AF_UNIX socket .: at 0x........: socketpair (in /...libc...) - by 0x........: main (fdleak_socketpair.c:15) + by 0x........: (below main) (in /...libc...) Open AF_UNIX socket .: at 0x........: socketpair (in /...libc...) - by 0x........: main (fdleak_socketpair.c:15) + by 0x........: (below main) (in /...libc...) Open file descriptor .: . -- 2.47.2