godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

32-bit MinGW g++ doesn't call the correct overload for the new operator when a type is 16 bytes aligned.

Browse Source 
It uses the non-aligned version, which on 32 bit platforms usually returns an 8 byte aligned block. We therefore default to 16 byte aligned allocations when the regular new operator is used.

Fixes: godotengine/godot#105455
This commit is contained in:
Jorrit Rouwe
2025-04-23 22:12:43 +02:00
parent 931820d33c
commit 07fcb82958
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
thirdparty/jolt_physics/Jolt/Core/Memory.h vendored
View File

@@ -27,12 +27,24 @@ JPH_EXPORT extern AlignedFreeFunction AlignedFree;
/// Register platform default allocation / free functions /// Register platform default allocation / free functions
JPH_EXPORT void RegisterDefaultAllocator(); JPH_EXPORT void RegisterDefaultAllocator();
// 32-bit MinGW g++ doesn't call the correct overload for the new operator when a type is 16 bytes aligned.
// It uses the non-aligned version, which on 32 bit platforms usually returns an 8 byte aligned block.
// We therefore default to 16 byte aligned allocations when the regular new operator is used.
// See: https://github.com/godotengine/godot/issues/105455#issuecomment-2824311547
#if defined(JPH_COMPILER_MINGW) && JPH_CPU_ADDRESS_BITS == 32
#define JPH_INTERNAL_DEFAULT_ALLOCATE(size) JPH::AlignedAllocate(size, 16)
#define JPH_INTERNAL_DEFAULT_FREE(pointer) JPH::AlignedFree(pointer)
#else
#define JPH_INTERNAL_DEFAULT_ALLOCATE(size) JPH::Allocate(size)
#define JPH_INTERNAL_DEFAULT_FREE(pointer) JPH::Free(pointer)
#endif
/// Macro to override the new and delete functions /// Macro to override the new and delete functions
#define JPH_OVERRIDE_NEW_DELETE \ #define JPH_OVERRIDE_NEW_DELETE \
JPH_INLINE void *operator new (size_t inCount) { return JPH::Allocate(inCount); } \ JPH_INLINE void *operator new (size_t inCount) { return JPH_INTERNAL_DEFAULT_ALLOCATE(inCount); } \
JPH_INLINE void operator delete (void *inPointer) noexcept { JPH::Free(inPointer); } \ JPH_INLINE void operator delete (void *inPointer) noexcept { JPH_INTERNAL_DEFAULT_FREE(inPointer); } \
JPH_INLINE void *operator new[] (size_t inCount) { return JPH::Allocate(inCount); } \ JPH_INLINE void *operator new[] (size_t inCount) { return JPH_INTERNAL_DEFAULT_ALLOCATE(inCount); } \
JPH_INLINE void operator delete[] (void *inPointer) noexcept { JPH::Free(inPointer); } \ JPH_INLINE void operator delete[] (void *inPointer) noexcept { JPH_INTERNAL_DEFAULT_FREE(inPointer); } \
JPH_INLINE void *operator new (size_t inCount, std::align_val_t inAlignment) { return JPH::AlignedAllocate(inCount, static_cast<size_t>(inAlignment)); } \ JPH_INLINE void *operator new (size_t inCount, std::align_val_t inAlignment) { return JPH::AlignedAllocate(inCount, static_cast<size_t>(inAlignment)); } \
JPH_INLINE void operator delete (void *inPointer, [[maybe_unused]] std::align_val_t inAlignment) noexcept { JPH::AlignedFree(inPointer); } \ JPH_INLINE void operator delete (void *inPointer, [[maybe_unused]] std::align_val_t inAlignment) noexcept { JPH::AlignedFree(inPointer); } \
JPH_INLINE void *operator new[] (size_t inCount, std::align_val_t inAlignment) { return JPH::AlignedAllocate(inCount, static_cast<size_t>(inAlignment)); } \ JPH_INLINE void *operator new[] (size_t inCount, std::align_val_t inAlignment) { return JPH::AlignedAllocate(inCount, static_cast<size_t>(inAlignment)); } \