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

Commit 574b091

Browse files
committed
Add castNode(type, ptr) for safe casting between NodeTag based types.
The new function allows to cast from one NodeTag based type to another, while asserting that the conversion is valid. This replaces the common pattern of doing a cast and a Assert(IsA(ptr, type)) close-by. As this seems likely to be used pervasively, we decided to backpatch this change the addition of this macro. Otherwise backpatched fixes are more likely not to work on back-branches. On branches before 9.6, where we do not yet rely on inline functions being available, the type assertion is only performed if PG_USE_INLINE support is detected. The cast obviously is performed regardless. For the benefit of verifying the macro compiles in the back-branches, this commit contains a single use of the new macro. On master, a somewhat larger conversion will be committed separately. Author: Peter Eisentraut and Andres Freund Reviewed-By: Tom Lane Discussion: https://postgr.es/m/c5d387d9-3440-f5e0-f9d4-71d53b9fbe52@2ndquadrant.com Backpatch: 9.2-
1 parent 56b42a3 commit 574b091

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

src/backend/tcop/postgres.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ pg_plan_queries(List *querytrees, int cursorOptions, ParamListInfo boundParams)
844844

845845
foreach(query_list, querytrees)
846846
{
847-
Query *query = (Query *) lfirst(query_list);
847+
Query *query = castNode(Query, lfirst(query_list));
848848
Node *stmt;
849849

850850
if (query->commandType == CMD_UTILITY)

src/include/nodes/nodes.h

+20
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,26 @@ extern PGDLLIMPORT Node *newNodeMacroHolder;
542542

543543
#define IsA(nodeptr,_type_) (nodeTag(nodeptr) == T_##_type_)
544544

545+
/*
546+
* castNode(type, ptr) casts ptr to type and, if cassert is enabled, verifies
547+
* that the the c actually has the appropriate type (using it's nodeTag()).
548+
*
549+
* Use an inline function when assertions are enabled, to avoid multiple
550+
* evaluations of the ptr argument (which could e.g. be a function call).
551+
*/
552+
#ifdef USE_ASSERT_CHECKING
553+
static inline Node*
554+
castNodeImpl(enum NodeTag type, void *ptr)
555+
{
556+
Assert(ptr == NULL || nodeTag(ptr) == type);
557+
return ptr;
558+
}
559+
#define castNode(_type_, nodeptr) ((_type_ *) castNodeImpl(T_##_type_, nodeptr))
560+
#else
561+
#define castNode(_type_,nodeptr) ((_type_ *)(nodeptr))
562+
#endif
563+
564+
545565
/* ----------------------------------------------------------------
546566
* extern declarations follow
547567
* ----------------------------------------------------------------

0 commit comments

Comments
 (0)