From 8abacdb5305619a19fb3dc7eaa53d4cc4d7d805e Mon Sep 17 00:00:00 2001 From: Jelte Fennema-Nio Date: Thu, 19 Feb 2026 23:55:43 +0100 Subject: [PATCH v10 3/4] Make unconstify and unvolatize use StaticAssertVariableIsOfTypeMacro The unconstify and unvolatize macros had an almost identical assertion as was already defined in StaticAssertVariableIsOfTypeMacro, only it had a less useful error message and didn't have a sizeof fallback. --- src/include/c.h | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/include/c.h b/src/include/c.h index df01acdf6ba..c92b214f6b0 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -1273,20 +1273,13 @@ typedef struct PGAlignedXLogBlock PGAlignedXLogBlock; #if defined(__cplusplus) #define unconstify(underlying_type, expr) const_cast(expr) #define unvolatize(underlying_type, expr) const_cast(expr) -#elif defined(HAVE__BUILTIN_TYPES_COMPATIBLE_P) +#else #define unconstify(underlying_type, expr) \ - (StaticAssertExpr(__builtin_types_compatible_p(typeof(expr), const underlying_type), \ - "wrong cast"), \ + (StaticAssertVariableIsOfTypeMacro(expr, const underlying_type), \ (underlying_type) (expr)) #define unvolatize(underlying_type, expr) \ - (StaticAssertExpr(__builtin_types_compatible_p(typeof(expr), volatile underlying_type), \ - "wrong cast"), \ + (StaticAssertVariableIsOfTypeMacro(expr, volatile underlying_type), \ (underlying_type) (expr)) -#else -#define unconstify(underlying_type, expr) \ - ((underlying_type) (expr)) -#define unvolatize(underlying_type, expr) \ - ((underlying_type) (expr)) #endif /* -- 2.53.0