Skip to content

Commit

Permalink
pythongh-90815: Fix _PyMem_MimallocEnabled() compiler warning (python…
Browse files Browse the repository at this point in the history
…#111522)

Don't declare _PyMem_MimallocEnabled() if WITH_PYMALLOC macro is not
defined (./configure --without-pymalloc).

Fix also a typo in _PyInterpreterState_FinalizeAllocatedBlocks().
  • Loading branch information
vstinner authored and FullteaR committed Nov 3, 2023
1 parent 0a9cd67 commit dbc6dc5
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Objects/obmalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -561,14 +561,13 @@ _PyMem_GetCurrentAllocatorName(void)
}


#if defined(WITH_PYMALLOC) || defined(WITH_MIMALLOC)
#ifdef WITH_PYMALLOC
static int
_PyMem_DebugEnabled(void)
{
return (_PyObject.malloc == _PyMem_DebugMalloc);
}

#ifdef WITH_PYMALLOC
static int
_PyMem_PymallocEnabled(void)
{
Expand All @@ -579,7 +578,7 @@ _PyMem_PymallocEnabled(void)
return (_PyObject.malloc == _PyObject_Malloc);
}
}
#endif

#ifdef WITH_MIMALLOC
static int
_PyMem_MimallocEnabled(void)
Expand All @@ -591,8 +590,9 @@ _PyMem_MimallocEnabled(void)
return (_PyObject.malloc == _PyObject_MiMalloc);
}
}
#endif
#endif // defined(WITH_PYMALLOC) || defined(WITH_MIMALLOC)
#endif // WITH_MIMALLOC

#endif // WITH_PYMALLOC


static void
Expand Down Expand Up @@ -1073,7 +1073,7 @@ _PyInterpreterState_GetAllocatedBlocks(PyInterpreterState *interp)
void
_PyInterpreterState_FinalizeAllocatedBlocks(PyInterpreterState *interp)
{
#ifdef WITH_MIAMLLOC
#ifdef WITH_MIMALLOC
if (_PyMem_MimallocEnabled()) {
return;
}
Expand Down

0 comments on commit dbc6dc5

Please sign in to comment.