From f8254b5252c85a1ea73501e28ea719c19ee038d7 Mon Sep 17 00:00:00 2001
From: Tender Wang <tndrwang@gmail.com>
Date: Tue, 10 Mar 2026 20:33:25 +0800
Subject: [PATCH] Simplify shmem size calulations.

---
 src/backend/access/transam/xlogrecovery.c  | 6 +-----
 src/backend/postmaster/pgarch.c            | 6 +-----
 src/backend/replication/walreceiverfuncs.c | 6 +-----
 src/backend/utils/misc/injection_point.c   | 5 +----
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c
index 6d2c4a86b96..9e5f8a78824 100644
--- a/src/backend/access/transam/xlogrecovery.c
+++ b/src/backend/access/transam/xlogrecovery.c
@@ -390,12 +390,8 @@ static void SetLatestXTime(TimestampTz xtime);
 Size
 XLogRecoveryShmemSize(void)
 {
-	Size		size;
-
 	/* XLogRecoveryCtl */
-	size = sizeof(XLogRecoveryCtlData);
-
-	return size;
+	return sizeof(XLogRecoveryCtlData);
 }
 
 void
diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c
index fa4bdfe9ab9..6276ebac09d 100644
--- a/src/backend/postmaster/pgarch.c
+++ b/src/backend/postmaster/pgarch.c
@@ -158,11 +158,7 @@ static void pgarch_call_module_shutdown_cb(int code, Datum arg);
 Size
 PgArchShmemSize(void)
 {
-	Size		size = 0;
-
-	size = add_size(size, sizeof(PgArchData));
-
-	return size;
+	return sizeof(PgArchData);
 }
 
 /* Allocate and initialize archiver-related shared memory */
diff --git a/src/backend/replication/walreceiverfuncs.c b/src/backend/replication/walreceiverfuncs.c
index 45b9d4f09f2..7a5f9893fb9 100644
--- a/src/backend/replication/walreceiverfuncs.c
+++ b/src/backend/replication/walreceiverfuncs.c
@@ -44,11 +44,7 @@ WalRcvData *WalRcv = NULL;
 Size
 WalRcvShmemSize(void)
 {
-	Size		size = 0;
-
-	size = add_size(size, sizeof(WalRcvData));
-
-	return size;
+	return sizeof(WalRcvData);
 }
 
 /* Allocate and initialize walreceiver-related shared memory */
diff --git a/src/backend/utils/misc/injection_point.c b/src/backend/utils/misc/injection_point.c
index c06b0e9b800..94ca54de57a 100644
--- a/src/backend/utils/misc/injection_point.c
+++ b/src/backend/utils/misc/injection_point.c
@@ -233,10 +233,7 @@ Size
 InjectionPointShmemSize(void)
 {
 #ifdef USE_INJECTION_POINTS
-	Size		sz = 0;
-
-	sz = add_size(sz, sizeof(InjectionPointsCtl));
-	return sz;
+	return sizeof(InjectionPointsCtl);
 #else
 	return 0;
 #endif
-- 
2.34.1