From e757c04f3da5729400d466ffa8a0bf91f8cf272f Mon Sep 17 00:00:00 2001
From: Nathan Bossart <nathan@postgresql.org>
Date: Wed, 18 Feb 2026 10:32:26 -0600
Subject: [PATCH v1 3/3] Convert SpinLock* macros to static inline functions.

---
 src/include/storage/spin.h | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/include/storage/spin.h b/src/include/storage/spin.h
index 78c95ae538b..5b680ff5dd8 100644
--- a/src/include/storage/spin.h
+++ b/src/include/storage/spin.h
@@ -5,22 +5,19 @@
  *
  *
  *	The interface to spinlocks is defined by the typedef "slock_t" and
- *	these macros:
+ *	these functions:
  *
- *	void SpinLockInit(volatile slock_t *lock)
+ *	void SpinLockInit(slock_t *lock)
  *		Initialize a spinlock (to the unlocked state).
  *
- *	void SpinLockAcquire(volatile slock_t *lock)
+ *	void SpinLockAcquire(slock_t *lock)
  *		Acquire a spinlock, waiting if necessary.
  *		Time out and abort() if unable to acquire the lock in a
  *		"reasonable" amount of time --- typically ~ 1 minute.
  *
- *	void SpinLockRelease(volatile slock_t *lock)
+ *	void SpinLockRelease(slock_t *lock)
  *		Unlock a previously acquired lock.
  *
- *	Callers must beware that the macro argument may be evaluated multiple
- *	times!
- *
  *	Load and store operations in calling code are guaranteed not to be
  *	reordered with respect to these operations, because they include a
  *	compiler barrier.  (Before PostgreSQL 9.5, callers needed to use a
@@ -29,9 +26,9 @@
  *	Keep in mind the coding rule that spinlocks must not be held for more
  *	than a few instructions.  In particular, we assume it is not possible
  *	for a CHECK_FOR_INTERRUPTS() to occur while holding a spinlock, and so
- *	it is not necessary to do HOLD/RESUME_INTERRUPTS() in these macros.
+ *	it is not necessary to do HOLD/RESUME_INTERRUPTS() in these functions.
  *
- *	These macros are implemented in terms of hardware-dependent macros
+ *	These functions are implemented in terms of hardware-dependent macros
  *	supplied by s_lock.h.  There is not currently any extra functionality
  *	added by this header, but there has been in the past and may someday
  *	be again.
@@ -49,11 +46,22 @@
 
 #include "storage/s_lock.h"
 
+static inline void
+SpinLockInit(slock_t *lock)
+{
+	S_INIT_LOCK(lock);
+}
 
-#define SpinLockInit(lock)	S_INIT_LOCK(lock)
-
-#define SpinLockAcquire(lock) S_LOCK(lock)
+static inline void
+SpinLockAcquire(slock_t *lock)
+{
+	S_LOCK(lock);
+}
 
-#define SpinLockRelease(lock) S_UNLOCK(lock)
+static inline void
+SpinLockRelease(slock_t *lock)
+{
+	S_UNLOCK(lock);
+}
 
 #endif							/* SPIN_H */
-- 
2.50.1 (Apple Git-155)