Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit ea473fb

Browse files
tglsfdctglsfdc
committed
Add infrastructure for compile-time assertions about variable types.
Currently, the macros only work with fairly recent gcc versions, but there is room to expand them to other compilers that have comparable features. Heavily revised and autoconfiscated version of a patch by Andres Freund.
1 parent 26fd82d commit ea473fb

File tree

6 files changed

+214
-0
lines changed

6 files changed

+214
-0
lines changed

‎config/c-compiler.m4

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,46 @@ fi])# PGAC_C_FUNCNAME_SUPPORT
121121

122122

123123

124+
# PGAC_C_STATIC_ASSERT
125+
# -----------------------
126+
# Check if the C compiler understands _Static_assert(),
127+
# and define HAVE__STATIC_ASSERT if so.
128+
#
129+
# We actually check the syntax ({ _Static_assert(...) }), because we need
130+
# gcc-style compound expressions to be able to wrap the thing into macros.
131+
AC_DEFUN([PGAC_C_STATIC_ASSERT],
132+
[AC_CACHE_CHECK(for _Static_assert, pgac_cv__static_assert,
133+
[AC_TRY_LINK([],
134+
[({ _Static_assert(1, "foo"); })],
135+
[pgac_cv__static_assert=yes],
136+
[pgac_cv__static_assert=no])])
137+
if test x"$pgac_cv__static_assert" = xyes ; then
138+
AC_DEFINE(HAVE__STATIC_ASSERT, 1,
139+
[Define to 1 if your compiler understands _Static_assert.])
140+
fi])# PGAC_C_STATIC_ASSERT
141+
142+
143+
144+
# PGAC_C_TYPES_COMPATIBLE
145+
# -----------------------
146+
# Check if the C compiler understands __builtin_types_compatible_p,
147+
# and define HAVE__BUILTIN_TYPES_COMPATIBLE_P if so.
148+
#
149+
# We check usage with __typeof__, though it's unlikely any compiler would
150+
# have the former and not the latter.
151+
AC_DEFUN([PGAC_C_TYPES_COMPATIBLE],
152+
[AC_CACHE_CHECK(for __builtin_types_compatible_p, pgac_cv__types_compatible,
153+
[AC_TRY_COMPILE([],
154+
[ int x; static int y[__builtin_types_compatible_p(__typeof__(x), int)]; ],
155+
[pgac_cv__types_compatible=yes],
156+
[pgac_cv__types_compatible=no])])
157+
if test x"$pgac_cv__types_compatible" = xyes ; then
158+
AC_DEFINE(HAVE__BUILTIN_TYPES_COMPATIBLE_P, 1,
159+
[Define to 1 if your compiler understands __builtin_types_compatible_p.])
160+
fi])# PGAC_C_TYPES_COMPATIBLE
161+
162+
163+
124164
# PGAC_PROG_CC_CFLAGS_OPT
125165
# -----------------------
126166
# Given a string, check if the compiler supports the string as a

‎configure

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15524,6 +15524,125 @@ cat >>confdefs.h <<\_ACEOF
1552415524
_ACEOF
1552515525

1552615526
fi
15527+
fi
15528+
{ $as_echo "$as_me:$LINENO: checking for _Static_assert" >&5
15529+
$as_echo_n "checking for _Static_assert... " >&6; }
15530+
if test "${pgac_cv__static_assert+set}" = set; then
15531+
$as_echo_n "(cached) " >&6
15532+
else
15533+
cat >conftest.$ac_ext <<_ACEOF
15534+
/* confdefs.h. */
15535+
_ACEOF
15536+
cat confdefs.h >>conftest.$ac_ext
15537+
cat >>conftest.$ac_ext <<_ACEOF
15538+
/* end confdefs.h. */
15539+
15540+
int
15541+
main ()
15542+
{
15543+
({ _Static_assert(1, "foo"); })
15544+
;
15545+
return 0;
15546+
}
15547+
_ACEOF
15548+
rm -f conftest.$ac_objext conftest$ac_exeext
15549+
if { (ac_try="$ac_link"
15550+
case "(($ac_try" in
15551+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15552+
*) ac_try_echo=$ac_try;;
15553+
esac
15554+
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15555+
$as_echo "$ac_try_echo") >&5
15556+
(eval "$ac_link") 2>conftest.er1
15557+
ac_status=$?
15558+
grep -v '^ *+' conftest.er1 >conftest.err
15559+
rm -f conftest.er1
15560+
cat conftest.err >&5
15561+
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15562+
(exit $ac_status); } && {
15563+
test -z "$ac_c_werror_flag" ||
15564+
test ! -s conftest.err
15565+
} && test -s conftest$ac_exeext && {
15566+
test "$cross_compiling" = yes ||
15567+
$as_test_x conftest$ac_exeext
15568+
}; then
15569+
pgac_cv__static_assert=yes
15570+
else
15571+
$as_echo "$as_me: failed program was:" >&5
15572+
sed 's/^/| /' conftest.$ac_ext >&5
15573+
15574+
pgac_cv__static_assert=no
15575+
fi
15576+
15577+
rm -rf conftest.dSYM
15578+
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
15579+
conftest$ac_exeext conftest.$ac_ext
15580+
fi
15581+
{ $as_echo "$as_me:$LINENO: result: $pgac_cv__static_assert" >&5
15582+
$as_echo "$pgac_cv__static_assert" >&6; }
15583+
if test x"$pgac_cv__static_assert" = xyes ; then
15584+
15585+
cat >>confdefs.h <<\_ACEOF
15586+
#define HAVE__STATIC_ASSERT 1
15587+
_ACEOF
15588+
15589+
fi
15590+
{ $as_echo "$as_me:$LINENO: checking for __builtin_types_compatible_p" >&5
15591+
$as_echo_n "checking for __builtin_types_compatible_p... " >&6; }
15592+
if test "${pgac_cv__types_compatible+set}" = set; then
15593+
$as_echo_n "(cached) " >&6
15594+
else
15595+
cat >conftest.$ac_ext <<_ACEOF
15596+
/* confdefs.h. */
15597+
_ACEOF
15598+
cat confdefs.h >>conftest.$ac_ext
15599+
cat >>conftest.$ac_ext <<_ACEOF
15600+
/* end confdefs.h. */
15601+
15602+
int
15603+
main ()
15604+
{
15605+
int x; static int y[__builtin_types_compatible_p(__typeof__(x), int)];
15606+
;
15607+
return 0;
15608+
}
15609+
_ACEOF
15610+
rm -f conftest.$ac_objext
15611+
if { (ac_try="$ac_compile"
15612+
case "(($ac_try" in
15613+
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15614+
*) ac_try_echo=$ac_try;;
15615+
esac
15616+
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
15617+
$as_echo "$ac_try_echo") >&5
15618+
(eval "$ac_compile") 2>conftest.er1
15619+
ac_status=$?
15620+
grep -v '^ *+' conftest.er1 >conftest.err
15621+
rm -f conftest.er1
15622+
cat conftest.err >&5
15623+
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
15624+
(exit $ac_status); } && {
15625+
test -z "$ac_c_werror_flag" ||
15626+
test ! -s conftest.err
15627+
} && test -s conftest.$ac_objext; then
15628+
pgac_cv__types_compatible=yes
15629+
else
15630+
$as_echo "$as_me: failed program was:" >&5
15631+
sed 's/^/| /' conftest.$ac_ext >&5
15632+
15633+
pgac_cv__types_compatible=no
15634+
fi
15635+
15636+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15637+
fi
15638+
{ $as_echo "$as_me:$LINENO: result: $pgac_cv__types_compatible" >&5
15639+
$as_echo "$pgac_cv__types_compatible" >&6; }
15640+
if test x"$pgac_cv__types_compatible" = xyes ; then
15641+
15642+
cat >>confdefs.h <<\_ACEOF
15643+
#define HAVE__BUILTIN_TYPES_COMPATIBLE_P 1
15644+
_ACEOF
15645+
1552715646
fi
1552815647
{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
1552915648
$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }

‎configure.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,6 +1104,8 @@ AC_C_FLEXIBLE_ARRAY_MEMBER
11041104
PGAC_C_SIGNED
11051105
AC_C_VOLATILE
11061106
PGAC_C_FUNCNAME_SUPPORT
1107+
PGAC_C_STATIC_ASSERT
1108+
PGAC_C_TYPES_COMPATIBLE
11071109
PGAC_STRUCT_TIMEZONE
11081110
PGAC_UNION_SEMUN
11091111
PGAC_STRUCT_SOCKADDR_UN

‎src/include/c.h

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,47 @@ typedef NameData *Name;
689689
} while (0)
690690

691691

692+
/*
693+
* Macros to support compile-time assertion checks, if the compiler has them.
694+
*
695+
* If the "condition" (a compile-time-constant expression) evaluates to false,
696+
* throw a compile error using the "errmessage" (a string literal).
697+
*
698+
* gcc 4.6 and up supports _Static_assert(), but it has bizarre syntactic
699+
* placement restrictions. These macros make it safe to use as a statement
700+
* or in an expression, respectively.
701+
*/
702+
#ifdef HAVE__STATIC_ASSERT
703+
#define StaticAssertStmt(condition, errmessage) \
704+
do { _Static_assert(condition, errmessage); } while(0)
705+
#define StaticAssertExpr(condition, errmessage) \
706+
({ StaticAssertStmt(condition, errmessage); true; })
707+
#else /* !HAVE__STATIC_ASSERT */
708+
#define StaticAssertStmt(condition, errmessage)
709+
#define StaticAssertExpr(condition, errmessage) ((void) true)
710+
#endif /* HAVE__STATIC_ASSERT */
711+
712+
713+
/*
714+
* Compile-time checks that a variable (or expression) has the specified type.
715+
*
716+
* AssertVariableIsOfType() can be used as a statement.
717+
* AssertVariableIsOfTypeMacro() is intended for use in macros, eg
718+
* #define foo(x) (AssertVariableIsOfTypeMacro(x, int), bar(x))
719+
*/
720+
#ifdef HAVE__BUILTIN_TYPES_COMPATIBLE_P
721+
#define AssertVariableIsOfType(varname, typename) \
722+
StaticAssertStmt(__builtin_types_compatible_p(__typeof__(varname), typename), \
723+
CppAsString(varname) " does not have type " CppAsString(typename))
724+
#define AssertVariableIsOfTypeMacro(varname, typename) \
725+
StaticAssertExpr(__builtin_types_compatible_p(__typeof__(varname), typename), \
726+
CppAsString(varname) " does not have type " CppAsString(typename))
727+
#else /* !HAVE__BUILTIN_TYPES_COMPATIBLE_P */
728+
#define AssertVariableIsOfType(varname, typename)
729+
#define AssertVariableIsOfTypeMacro(varname, typename) ((void) true)
730+
#endif /* HAVE__BUILTIN_TYPES_COMPATIBLE_P */
731+
732+
692733
/* ----------------------------------------------------------------
693734
* Section 7: random stuff
694735
* ----------------------------------------------------------------

‎src/include/pg_config.h.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,12 @@
635635
/* Define to 1 if you have the <winldap.h> header file. */
636636
#undef HAVE_WINLDAP_H
637637

638+
/* Define to 1 if your compiler understands __builtin_types_compatible_p. */
639+
#undef HAVE__BUILTIN_TYPES_COMPATIBLE_P
640+
641+
/* Define to 1 if your compiler understands _Static_assert. */
642+
#undef HAVE__STATIC_ASSERT
643+
638644
/* Define to the appropriate snprintf format for 64-bit ints. */
639645
#undef INT64_FORMAT
640646

‎src/include/pg_config.h.win32

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,12 @@
526526
/* Define to 1 if you have the <winldap.h> header file. */
527527
/* #undef HAVE_WINLDAP_H */
528528

529+
/* Define to 1 if your compiler understands __builtin_types_compatible_p. */
530+
/* #undef HAVE__BUILTIN_TYPES_COMPATIBLE_P */
531+
532+
/* Define to 1 if your compiler understands _Static_assert. */
533+
/* #undef HAVE__STATIC_ASSERT */
534+
529535
/* Define to the appropriate snprintf format for 64-bit ints, if any. */
530536
#define INT64_FORMAT "%lld"
531537

0 commit comments

Comments
 (0)