From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 29463385625A; Tue, 10 May 2022 18:28:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 29463385625A Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] malloc: Disable malloc builtins on tests X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: fe94561d542a9c73c0334403c0c47aa9ac5203a7 X-Git-Newrev: baea5737f6473e6c3f017cf47705a50d5f4ac0ec Message-Id: <20220510182848.29463385625A@sourceware.org> Date: Tue, 10 May 2022 18:28:48 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 May 2022 18:28:48 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=baea5737f6473e6c3f017cf47705a50d5f4ac0ec commit baea5737f6473e6c3f017cf47705a50d5f4ac0ec Author: Adhemerval Zanella Date: Wed Mar 30 15:42:18 2022 -0300 malloc: Disable malloc builtins on tests To avoid compiler optimize away memory allocation calls, which might interfere when both valid and invalid calls checks. Diff: --- malloc/Makefile | 11 +++++++++++ malloc/tst-malloc.c | 1 + malloc/tst-memalign.c | 3 +-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/malloc/Makefile b/malloc/Makefile index 4e32de2a0b..250717d255 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -367,3 +367,14 @@ tst-mallocstate-malloc-check-ENV = LD_PRELOAD=$(objpfx)libc_malloc_debug.so # libc_malloc_debug.so. $(objpfx)tst-mallocstate: $(objpfx)libc_malloc_debug.so $(objpfx)tst-mallocstate-malloc-check: $(objpfx)libc_malloc_debug.so + +CFLAGS-tst-memalign.c += -fno-builtin +CFLAGS-tst-malloc.c += -fno-builtin +CFLAGS-tst-malloc-backtrace.c += -fno-builtin +CFLAGS-tst-malloc-check.c += -fno-builtin +CFLAGS-tst-malloc-too-large.c += -fno-builtin +CFLAGS-tst-realloc.c += -fno-builtin +CFLAGS-tst-valloc.c += -fno-builtin +CFLAGS-tst-compathooks-off.c += -fno-builtin +CFLAGS-tst-compathooks-on.c += -fno-builtin +CFLAGS-tst-mallinfo2.c += -fno-builtin diff --git a/malloc/tst-malloc.c b/malloc/tst-malloc.c index 62e3b9b95c..e3855035e7 100644 --- a/malloc/tst-malloc.c +++ b/malloc/tst-malloc.c @@ -46,6 +46,7 @@ do_test (void) p = malloc (-1); DIAG_POP_NEEDS_COMMENT; save = errno; + asm volatile("" ::: "memory"); if (p != NULL) merror ("malloc (-1) succeeded."); diff --git a/malloc/tst-memalign.c b/malloc/tst-memalign.c index b5933f4741..5da00954e2 100644 --- a/malloc/tst-memalign.c +++ b/malloc/tst-memalign.c @@ -124,5 +124,4 @@ do_test (void) return errors != 0; } -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include