malloc: add indirection for malloc(-like) functions in tests [BZ #32366]

GCC 15 introduces allocation dead code removal (DCE) for PR117370 in
r15-5255-g7828dc070510f8. This breaks various glibc tests which want
to assert various properties of the allocator without doing anything
obviously useful with the allocated memory.

Alexander Monakov rightly pointed out that we can and should do better
than passing -fno-malloc-dce to paper over the problem. Not least because
GCC 14 already does such DCE where there's no testing of malloc's return
value against NULL, and LLVM has such optimisations too.

Handle this by providing malloc (and friends) wrappers with a volatile
function pointer to obscure that we're calling malloc (et. al) from the
compiler.

Reviewed-by: Paul Eggert <eggert@cs.ucla.edu>
This commit is contained in:
Sam James 2024-12-09 23:11:25 +00:00
parent 28d102d15c
commit a9944a52c9
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
9 changed files with 53 additions and 2 deletions

View File

@ -25,6 +25,8 @@
#include <libc-diag.h>
#include <support/check.h>
#include "tst-malloc-aux.h"
static int
do_test (void)
{

View File

@ -25,6 +25,8 @@
#include <support/check.h>
#include <support/support.h>
#include "tst-malloc-aux.h"
extern void (*volatile __free_hook) (void *, const void *);
extern void *(*volatile __malloc_hook)(size_t, const void *);
extern void *(*volatile __realloc_hook)(void *, size_t, const void *);

41
malloc/tst-malloc-aux.h Normal file
View File

@ -0,0 +1,41 @@
/* Wrappers for malloc-like functions to allow testing the implementation
without optimization.
Copyright (C) 2024 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; see the file COPYING.LIB. If
not, see <https://www.gnu.org/licenses/>. */
#ifndef TST_MALLOC_AUX_H
#define TST_MALLOC_AUX_H
#include <stddef.h>
#include <stdlib.h>
static void *(*volatile aligned_alloc_indirect)(size_t, size_t) = aligned_alloc;
static void *(*volatile calloc_indirect)(size_t, size_t) = calloc;
static void *(*volatile malloc_indirect)(size_t) = malloc;
static void *(*volatile realloc_indirect)(void*, size_t) = realloc;
#undef aligned_alloc
#undef calloc
#undef malloc
#undef realloc
#define aligned_alloc aligned_alloc_indirect
#define calloc calloc_indirect
#define malloc malloc_indirect
#define realloc realloc_indirect
#endif /* TST_MALLOC_AUX_H */

View File

@ -20,6 +20,8 @@
#include <stdlib.h>
#include <libc-diag.h>
#include "tst-malloc-aux.h"
static int errors = 0;
static void

View File

@ -43,6 +43,7 @@
#include <unistd.h>
#include <sys/param.h>
#include "tst-malloc-aux.h"
/* This function prepares for each 'too-large memory allocation' test by
performing a small successful malloc/free and resetting errno prior to

View File

@ -22,6 +22,8 @@
#include <libc-diag.h>
#include <time.h>
#include "tst-malloc-aux.h"
static int errors = 0;
static void

View File

@ -23,6 +23,8 @@
#include <libc-diag.h>
#include <support/check.h>
#include "tst-malloc-aux.h"
static int
do_test (void)
{

View File

@ -113,7 +113,7 @@ void *xposix_memalign (size_t alignment, size_t n)
__attribute_malloc__ __attribute_alloc_align__ ((1))
__attribute_alloc_size__ ((2)) __attr_dealloc_free __returns_nonnull;
char *xasprintf (const char *format, ...)
__attribute__ ((format (printf, 1, 2), malloc)) __attr_dealloc_free
__attribute__ ((format (printf, 1, 2), __malloc__)) __attr_dealloc_free
__returns_nonnull;
char *xstrdup (const char *) __attr_dealloc_free __returns_nonnull;
char *xstrndup (const char *, size_t) __attr_dealloc_free __returns_nonnull;

View File

@ -27,7 +27,6 @@
#include <errno.h>
#include <fcntl.h>
#include <getopt.h>
#include <malloc.h>
#include <paths.h>
#include <search.h>
#include <signal.h>