[PATCH] Testsuite, asan, darwin: Adjust output pattern

[PATCH] Testsuite, asan, darwin: Adjust output pattern

[FX Coudert]

[-- Attachment #1: Type: text/plain, Size: 571 bytes --]

Since the last import from upstream libsanitizer, the output has changed
and now looks more like this:

READ of size 6 at 0x7ff7beb2a144 thread T0
    #0 0x101cf7796 in MemcmpInterceptorCommon(void*, int (*)(void const*, void const*, unsigned long), void const*, void const*, unsigned long) sanitizer_common_interceptors.inc:813
    #1 0x101cf7b99 in memcmp sanitizer_common_interceptors.inc:840
    #2 0x108a0c39f in __stack_chk_guard+0xf (dyld:x86_64+0x8039f)

so let's adjust the pattern accordingly.

Tested on x86_64-apple-darwin21. OK to push?

FX



[-- Attachment #2: 0001-Testsuite-asan-darwin-Adjust-output-pattern.patch --]
[-- Type: application/octet-stream, Size: 1743 bytes --]

From 200b8d5a656be9553d5d50c1f35c2f7f2af5b048 Mon Sep 17 00:00:00 2001
From: Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
Date: Mon, 11 Dec 2023 09:40:03 +0100
Subject: [PATCH] Testsuite, asan, darwin: Adjust output pattern

Since the last import from upstream libsanitizer, the output has changed
and now looks more like this:

READ of size 6 at 0x7ff7beb2a144 thread T0
    #0 0x101cf7796 in MemcmpInterceptorCommon(void*, int (*)(void const*, void const*, unsigned long), void const*, void const*, unsigned long) sanitizer_common_interceptors.inc:813
    #1 0x101cf7b99 in memcmp sanitizer_common_interceptors.inc:840
    #2 0x108a0c39f in __stack_chk_guard+0xf (dyld:x86_64+0x8039f)

so let's adjust the pattern accordingly.

gcc/testsuite/ChangeLog:

	* c-c++-common/asan/memcmp-1.c: Adjust pattern on darwin.
---
 gcc/testsuite/c-c++-common/asan/memcmp-1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc/testsuite/c-c++-common/asan/memcmp-1.c b/gcc/testsuite/c-c++-common/asan/memcmp-1.c
index 0d08c098e0e..31fd6e49851 100644
--- a/gcc/testsuite/c-c++-common/asan/memcmp-1.c
+++ b/gcc/testsuite/c-c++-common/asan/memcmp-1.c
@@ -21,4 +21,4 @@ main ()
 /* { dg-output "    #\[2-9\] 0x\[0-9a-f\]+ +(in _*main|\[(\])\[^\n\r]*(\n|\r\n|\r)" { target { ! *-*-darwin* } } } */
 
 /* { dg-output "    #\[0-9\] 0x\[0-9a-f\]+ +(in MemcmpInterceptorCommon|\[(\])\[^\n\r]*(\n|\r\n|\r)" { target *-*-darwin* } } */
-/* { dg-output "    #\[1-9\] 0x\[0-9a-f\]+ +(in wrap_(memcmp|bcmp)|\[(\])\[^\n\r]*(\n|\r\n|\r)" { target *-*-darwin* } } */
+/* { dg-output "    #\[1-9\] 0x\[0-9a-f\]+ +(in (memcmp|bcmp)|\[(\])\[^\n\r]*(\n|\r\n|\r)" { target *-*-darwin* } } */
-- 
2.39.3 (Apple Git-145)

Re: [PATCH] Testsuite, asan, darwin: Adjust output pattern

[Iain Sandoe]

Hi FX,

> On 11 Dec 2023, at 08:43, FX Coudert <fxcoudert@gmail.com> wrote:
> 
> Since the last import from upstream libsanitizer, the output has changed
> and now looks more like this:
> 
> READ of size 6 at 0x7ff7beb2a144 thread T0
>    #0 0x101cf7796 in MemcmpInterceptorCommon(void*, int (*)(void const*, void const*, unsigned long), void const*, void const*, unsigned long) sanitizer_common_interceptors.inc:813
>    #1 0x101cf7b99 in memcmp sanitizer_common_interceptors.inc:840
>    #2 0x108a0c39f in __stack_chk_guard+0xf (dyld:x86_64+0x8039f)
> 

I see the same on a spot-check of Darwin19.
I guess we just have to keep tweaking as the upstream alters output.

> so let's adjust the pattern accordingly.
> 
> Tested on x86_64-apple-darwin21. OK to push?

OK, 

Iain

> 
> FX
> 
> 
> <0001-Testsuite-asan-darwin-Adjust-output-pattern.patch>