From 94884e1c27ccd38bf494fc7f5aa46b269bbb6c9c Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Thu, 18 May 2017 22:22:13 +0300 Subject: [PATCH] Make slab allocator work on platforms with MAXIMUM_ALIGNOF < sizeof(int). Notably, m68k only needs 2-byte alignment. Per report from Christoph Berg. Discussion: https://www.postgresql.org/message-id/20170517193957.fwntkgi6epuso5l2@msg.df7cb.de --- src/backend/utils/mmgr/slab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c index 0fcfcb4c78..e59154ddda 100644 --- a/src/backend/utils/mmgr/slab.c +++ b/src/backend/utils/mmgr/slab.c @@ -194,9 +194,9 @@ SlabContextCreate(MemoryContext parent, MAXALIGN(sizeof(SlabChunk)), "padding calculation in SlabChunk is wrong"); - /* otherwise the linked list inside freed chunk isn't guaranteed to fit */ - StaticAssertStmt(MAXIMUM_ALIGNOF >= sizeof(int), - "MAXALIGN too small to fit int32"); + /* Make sure the linked list node fits inside a freed chunk */ + if (chunkSize < sizeof(int)) + chunkSize = sizeof(int); /* chunk, including SLAB header (both addresses nicely aligned) */ fullChunkSize = MAXALIGN(sizeof(SlabChunk) + MAXALIGN(chunkSize)); -- 2.40.0