10000 Change various Gin*Is* macros to return 0/1. · prmdeveloper/postgres@65a8a3f · GitHub
[go: up one dir, main page]

Skip to content

Commit 65a8a3f

Browse files
committed
Change various Gin*Is* macros to return 0/1.
Returning the direct result of bit arithmetic, in a macro intended to be used in a boolean manner, can be problematic if the return value is stored in a variable of type 'bool'. If bool is implemented using C99's _Bool, that can lead to comparison failures if the variable is then compared again with the expression (see ginStepRight() for an example that fails), as _Bool forces the result to be 0/1. That happens in some configurations of newer MSVC compilers. It's also problematic when storing the result of such an expression in a narrower type. Several gin macros have been declared in that style since gin's initial commit in 8a3631f. There's a lot more macros like this, but this is the only one causing regression test failures; and I don't want to commit and backpatch a larger patch with lots of conflicts just before the next set of minor releases. Discussion: 20150811154237.GD17575@awork2.anarazel.de Backpatch: All supported branches
1 parent 8ea71fd commit 65a8a3f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/include/access/gin_private.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,17 @@ typedef struct GinMetaPageData
106106
*/
107107
#define GinPageGetOpaque(page) ( (GinPageOpaque) PageGetSpecialPointer(page) )
108108

109-
#define GinPageIsLeaf(page) ( GinPageGetOpaque(page)->flags & GIN_LEAF )
109+
#define GinPageIsLeaf(page) ( (GinPageGetOpaque(page)->flags & GIN_LEAF) != 0 )
110110
#define GinPageSetLeaf(page) ( GinPageGetOpaque(page)->flags |= GIN_LEAF )
111111
#define GinPageSetNonLeaf(page) ( GinPageGetOpaque(page)->flags &= ~GIN_LEAF )
112-
#define GinPageIsData(page) ( GinPageGetOpaque(page)->flags & GIN_DATA )
112+
#define GinPageIsData(page) ( (GinPageGetOpaque(page)->flags & GIN_DATA) != 0 )
113113
#define GinPageSetData(page) ( GinPageGetOpaque(page)->flags |= GIN_DATA )
114-
#define GinPageIsList(page) ( GinPageGetOpaque(page)->flags & GIN_LIST )
114+
#define GinPageIsList(page) ( (GinPageGetOpaque(page)->flags & GIN_LIST) != 0 )
115115
#define GinPageSetList(page) ( GinPageGetOpaque(page)->flags |= GIN_LIST )
116-
#define GinPageHasFullRow(page) ( GinPageGetOpaque(page)->flags & GIN_LIST_FULLROW )
116+
#define GinPageHasFullRow(page) ( (GinPageGetOpaque(page)->flags & GIN_LIST_FULLROW) != 0 )
117117
#define GinPageSetFullRow(page) ( GinPageGetOpaque(page)->flags |= GIN_LIST_FULLROW )
118118

119-
#define GinPageIsDeleted(page) ( GinPageGetOpaque(page)->flags & GIN_DELETED)
119+
#define GinPageIsDeleted(page) ( (GinPageGetOpaque(page)->flags & GIN_DELETED) != 0 )
120120
#define GinPageSetDeleted(page) ( GinPageGetOpaque(page)->flags |= GIN_DELETED)
121121
#define GinPageSetNonDeleted(page) ( GinPageGetOpaque(page)->flags &= ~GIN_DELETED)
122122

0 commit comments

Comments
 (0)
0