From: Peter Eisentraut <peter@eisentraut.org>
Date: Thu, 3 Nov 2022 15:53:46 +0000 (-0400)
Subject: Make AssertPointerAlignment available to frontend code
X-Git-Tag: REL_16_BETA1~1382
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fe4c7384f469e077928cd40fa1da4bd05598f1f;p=thirdparty%2Fpostgresql.git

Make AssertPointerAlignment available to frontend code

We don't need separate definitions for frontend and backend, since the
contained Assert() will take care of the difference.  So this also
makes it simpler overall.

Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://www.postgresql.org/message-id/f64365b1-d5f9-ef83-41fe-404810f10e5a@enterprisedb.com
---

diff --git a/src/include/c.h b/src/include/c.h
index d70ed84ac58..98cdd285dd9 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -793,14 +793,12 @@ typedef NameData *Name;
 
 #define Assert(condition)	((void)true)
 #define AssertMacro(condition)	((void)true)
-#define AssertPointerAlignment(ptr, bndr)	((void)true)
 
 #elif defined(FRONTEND)
 
 #include <assert.h>
 #define Assert(p) assert(p)
 #define AssertMacro(p)	((void) assert(p))
-#define AssertPointerAlignment(ptr, bndr)	((void)true)
 
 #else							/* USE_ASSERT_CHECKING && !FRONTEND */
 
@@ -824,14 +822,14 @@ typedef NameData *Name;
 	((void) ((condition) || \
 			 (ExceptionalCondition(#condition, __FILE__, __LINE__), 0)))
 
+#endif							/* USE_ASSERT_CHECKING && !FRONTEND */
+
 /*
  * Check that `ptr' is `bndr' aligned.
  */
 #define AssertPointerAlignment(ptr, bndr) \
 	Assert(TYPEALIGN(bndr, (uintptr_t)(ptr)) == (uintptr_t)(ptr))
 
-#endif							/* USE_ASSERT_CHECKING && !FRONTEND */
-
 /*
  * ExceptionalCondition is compiled into the backend whether or not
  * USE_ASSERT_CHECKING is defined, so as to support use of extensions