Remove PF_USED_FOR_ASSERTS_ONLY from variables in general use

danielgustafsson · danielgustafsson · commit ac0db34e0e5c · 2021-11-30T14:02:14.000+01:00
fsstate in process_pending_requests (in postgres_fdw.c) was added in 8998e3c as an assertion-only variable, 1ec7fca stated using the variable outside of assertions. rd_index in get_index_column_opclass (in lsyscache.c) was introduced in 2a63683, and then promptly used in the fix commit 7e04160 shortly thereafter. This removes the PG_USED_FOR_ASSERTS_ONLY variable decoration from the above mentioned variables. Reviewed-by: Greg Nancarrow <gregn4422@gmail.com> Discussion: https://postgr.es/m/F959106C-0F21-43A5-B2AE-D007D51ACBEE@yesql.se
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
@@ -7058,7 +7058,7 @@ void
 process_pending_request(AsyncRequest *areq)
 {
 	ForeignScanState *node = (ForeignScanState *) areq->requestee;
-	PgFdwScanState *fsstate PG_USED_FOR_ASSERTS_ONLY = (PgFdwScanState *) node->fdw_state;
+	PgFdwScanState *fsstate = (PgFdwScanState *) node->fdw_state;
 
 	/* The request would have been pending for a callback */
 	Assert(areq->callback_pending);
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
@@ -3462,7 +3462,7 @@ Oid
 get_index_column_opclass(Oid index_oid, int attno)
 {
 	HeapTuple	tuple;
-	Form_pg_index rd_index PG_USED_FOR_ASSERTS_ONLY;
+	Form_pg_index rd_index;
 	Datum		datum;
 	bool		isnull;
 	oidvector  *indclass;

Original file line number	Diff line number	Diff line change
`@@ -7058,7 +7058,7 @@ void`
`7058`	`7058`	`process_pending_request(AsyncRequest *areq)`
`7059`	`7059`	`{`
`7060`	`7060`	`ForeignScanState node = (ForeignScanState ) areq->requestee;`
`7061`		`- PgFdwScanState fsstate PG_USED_FOR_ASSERTS_ONLY = (PgFdwScanState ) node->fdw_state;`
	`7061`	`+ PgFdwScanState fsstate = (PgFdwScanState ) node->fdw_state;`
`7062`	`7062`
`7063`	`7063`	`/* The request would have been pending for a callback */`
`7064`	`7064`	`Assert(areq->callback_pending);`
Original file line number	Diff line number	Diff line change
`@@ -3462,7 +3462,7 @@ Oid`
`3462`	`3462`	`get_index_column_opclass(Oid index_oid, int attno)`
`3463`	`3463`	`{`
`3464`	`3464`	`HeapTuple tuple;`
`3465`		`- Form_pg_index rd_index PG_USED_FOR_ASSERTS_ONLY;`
	`3465`	`+ Form_pg_index rd_index;`
`3466`	`3466`	`Datum datum;`
`3467`	`3467`	`bool isnull;`
`3468`	`3468`	`oidvector *indclass;`