since apparently _aligned_malloc requires freeing with _aligned_free and:
/* Defined if gomp_aligned_alloc doesn't use fallback version
and free can be used instead of gomp_aligned_free. */
#define GOMP_HAVE_EFFICIENT_ALIGNED_ALLOC 1
so the second condition isn't satisfied. For uses inside of the OpenMP
allocators we can still use _aligned_malloc but we need to call _aligned_free
in gomp_aligned_free.
Bootstrapped/regtested on x86_64-linux and i686-linux (no way to test on
mingw), committed to trunk.
2022-05-28 Jakub Jelinek <ja...@redhat.com>
PR libgomp/105745
* libgomp.h (GOMP_HAVE_EFFICIENT_ALIGNED_ALLOC): Don't define for
defined(HAVE__ALIGNED_MALLOC) case.
* alloc.c (gomp_aligned_alloc): Move defined(HAVE__ALIGNED_MALLOC)
handling as last option before fallback instead of first.
(gomp_aligned_free): For defined(HAVE__ALIGNED_MALLOC) call
_aligned_free.
--- libgomp/libgomp.h.jj 2022-05-23 21:44:48.941848475 +0200
+++ libgomp/libgomp.h 2022-05-27 13:11:55.576057315 +0200
@@ -87,7 +87,6 @@ enum memmodel
/* alloc.c */
#if defined(HAVE_ALIGNED_ALLOC) \
- || defined(HAVE__ALIGNED_MALLOC) \
|| defined(HAVE_POSIX_MEMALIGN) \
|| defined(HAVE_MEMALIGN)
/* Defined if gomp_aligned_alloc doesn't use fallback version
--- libgomp/alloc.c.jj 2022-01-11 22:31:41.361758955 +0100
+++ libgomp/alloc.c 2022-05-27 13:15:32.151816509 +0200
@@ -65,9 +65,7 @@ gomp_aligned_alloc (size_t al, size_t si
void *ret;
if (al < sizeof (void *))
al = sizeof (void *);
-#ifdef HAVE__ALIGNED_MALLOC
- ret = _aligned_malloc (size, al);
-#elif defined(HAVE_MEMALIGN)
+#ifdef HAVE_MEMALIGN
{
extern void *memalign (size_t, size_t);
ret = memalign (al, size);
@@ -83,6 +81,8 @@ gomp_aligned_alloc (size_t al, size_t si
else
ret = NULL;
}
+#elif defined(HAVE__ALIGNED_MALLOC)
+ ret = _aligned_malloc (size, al);
#else
ret = NULL;
if ((al & (al - 1)) == 0 && size)
@@ -106,6 +106,8 @@ gomp_aligned_free (void *ptr)
{
#ifdef GOMP_HAVE_EFFICIENT_ALIGNED_ALLOC
free (ptr);
+#elif defined(HAVE__ALIGNED_MALLOC)
+ _aligned_free (ptr);
#else
if (ptr)
free (((void **) ptr)[-1]);
Jakub
