diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2022-12-08 14:30:01 +0100 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2022-12-15 10:10:32 +0100 |
| commit | 75f49221c22286104f032827359783aa5f4e6646 (patch) | |
| tree | b4ac92eb6c557b4fd1ef6eda35ce9943564aba11 /src/backend/utils/adt | |
| parent | 2613dec4ed67c4a963d987cbd29284e0634b65c9 (diff) | |
| download | postgresql-75f49221c22286104f032827359783aa5f4e6646.tar.gz postgresql-75f49221c22286104f032827359783aa5f4e6646.zip | |
Static assertions cleanup
Because we added StaticAssertStmt() first before StaticAssertDecl(),
some uses as well as the instructions in c.h are now a bit backwards
from the "native" way static assertions are meant to be used in C.
This updates the guidance and moves some static assertions to better
places.
Specifically, since the addition of StaticAssertDecl(), we can put
static assertions at the file level. This moves a number of static
assertions out of function bodies, where they might have been stuck
out of necessity, to perhaps better places at the file level or in
header files.
Also, when the static assertion appears in a position where a
declaration is allowed, then using StaticAssertDecl() is more native
than StaticAssertStmt().
Reviewed-by: John Naylor <john.naylor@enterprisedb.com>
Discussion: https://www.postgresql.org/message-id/flat/941a04e7-dd6f-c0e4-8cdf-a33b3338cbda%40enterprisedb.com
Diffstat (limited to 'src/backend/utils/adt')
| -rw-r--r-- | src/backend/utils/adt/numeric.c | 3 | ||||
| -rw-r--r-- | src/backend/utils/adt/tsginidx.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/adt/xid8funcs.c | 15 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index c024928bc8d..152e1b7e0c4 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -4187,7 +4187,8 @@ int64_div_fast_to_numeric(int64 val1, int log10val2) { static int pow10[] = {1, 10, 100, 1000}; - StaticAssertStmt(lengthof(pow10) == DEC_DIGITS, "mismatch with DEC_DIGITS"); + StaticAssertDecl(lengthof(pow10) == DEC_DIGITS, "mismatch with DEC_DIGITS"); + if (unlikely(pg_mul_s64_overflow(val1, pow10[DEC_DIGITS - m], &val1))) { /* diff --git a/src/backend/utils/adt/tsginidx.c b/src/backend/utils/adt/tsginidx.c index e272fca0756..cf23aeb5ead 100644 --- a/src/backend/utils/adt/tsginidx.c +++ b/src/backend/utils/adt/tsginidx.c @@ -236,8 +236,6 @@ gin_tsquery_consistent(PG_FUNCTION_ARGS) * query. */ gcv.first_item = GETQUERY(query); - StaticAssertStmt(sizeof(GinTernaryValue) == sizeof(bool), - "sizes of GinTernaryValue and bool are not equal"); gcv.check = (GinTernaryValue *) check; gcv.map_item_operand = (int *) (extra_data[0]); diff --git a/src/backend/utils/adt/xid8funcs.c b/src/backend/utils/adt/xid8funcs.c index 2093776809f..3baf5f7d903 100644 --- a/src/backend/utils/adt/xid8funcs.c +++ b/src/backend/utils/adt/xid8funcs.c @@ -75,6 +75,14 @@ typedef struct ((MaxAllocSize - offsetof(pg_snapshot, xip)) / sizeof(FullTransactionId)) /* + * Compile-time limits on the procarray (MAX_BACKENDS processes plus + * MAX_BACKENDS prepared transactions) guarantee nxip won't be too large. + */ +StaticAssertDecl(MAX_BACKENDS * 2 <= PG_SNAPSHOT_MAX_NXIP, + "possible overflow in pg_current_snapshot()"); + + +/* * Helper to get a TransactionId from a 64-bit xid with wraparound detection. * * It is an ERROR if the xid is in the future. Otherwise, returns true if @@ -402,13 +410,6 @@ pg_current_snapshot(PG_FUNCTION_ARGS) if (cur == NULL) elog(ERROR, "no active snapshot set"); - /* - * Compile-time limits on the procarray (MAX_BACKENDS processes plus - * MAX_BACKENDS prepared transactions) guarantee nxip won't be too large. - */ - StaticAssertStmt(MAX_BACKENDS * 2 <= PG_SNAPSHOT_MAX_NXIP, - "possible overflow in pg_current_snapshot()"); - /* allocate */ nxip = cur->xcnt; snap = palloc(PG_SNAPSHOT_SIZE(nxip)); |