summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rowley2022-08-30 15:06:31 +0000
committerDavid Rowley2022-08-30 15:06:31 +0000
commit5495796ad12aae971137d184ff25add8f6b03968 (patch)
treef88d07f3536d7e36f4723667892e7e34ad5322f4
parentc98b6acdb252546e9bea0b9a37d95ca63d2ff0fa (diff)
Revert "Add missing padding from MemoryChunk struct"
This reverts commit df0f4feef. It turns out the problem which was causing the 32-bit ARM and PPC animals to fail was due to a MAXALIGN problem in slab.c. This was fixed by d5ee4db0e. The padding that was added in df0f4feef would only do anything on machines where uint64 was not aligned to 8 bytes. The 32-bit machines which were failing are not in that category, so revert this commit. Discussion: https://postgr.es/m/[email protected]
-rw-r--r--src/include/utils/memutils_memorychunk.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/include/utils/memutils_memorychunk.h b/src/include/utils/memutils_memorychunk.h
index 1e27d084cd4..685c177b681 100644
--- a/src/include/utils/memutils_memorychunk.h
+++ b/src/include/utils/memutils_memorychunk.h
@@ -111,14 +111,6 @@ typedef struct MemoryChunk
{
#ifdef MEMORY_CONTEXT_CHECKING
Size requested_size;
-#define MEMORYCHUNK_RAWSIZE (SIZEOF_SIZE_T + 8)
-#else
-#define MEMORYCHUNK_RAWSIZE 8
-#endif /* MEMORY_CONTEXT_CHECKING */
-
- /* ensure proper alignment by adding padding if needed */
-#if (MEMORYCHUNK_RAWSIZE % MAXIMUM_ALIGNOF) != 0
- char padding[MAXIMUM_ALIGNOF - MEMORYCHUNK_RAWSIZE % MAXIMUM_ALIGNOF];
#endif
/* bitfield for storing details about the chunk */