Fix some 32-bit shift warnings in MSVC

david-rowley · david-rowley · commit 2d1f3bce97a9 · 2022-11-25T11:05:22.000+13:00
7b37823 widened AclMode to 64 bits which resulted in 3 new additional warnings on MSVC. Here we make use of UINT64CONST to reassure the compiler that we do intend the bit shift expression to yield a 64-bit result. Discussion: https://postgr.es/m/CAApHDvo=pn01Y_3zASZZqn+cotF1c4QFCwWgk6MiF0VscaE5ug@mail.gmail.com
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
@@ -626,9 +626,9 @@ aclitemout(PG_FUNCTION_ARGS)
 
 	for (i = 0; i < N_ACL_RIGHTS; ++i)
 	{
-		if (ACLITEM_GET_PRIVS(*aip) & (1 << i))
+		if (ACLITEM_GET_PRIVS(*aip) & (UINT64CONST(1) << i))
 			*p++ = ACL_ALL_RIGHTS_STR[i];
-		if (ACLITEM_GET_GOPTIONS(*aip) & (1 << i))
+		if (ACLITEM_GET_GOPTIONS(*aip) & (UINT64CONST(1) << i))
 			*p++ = '*';
 	}
 
@@ -1786,7 +1786,7 @@ aclexplode(PG_FUNCTION_ARGS)
 				break;
 		}
 		aidata = &aidat[idx[0]];
-		priv_bit = 1 << idx[1];
+		priv_bit = UINT64CONST(1) << idx[1];
 
 		if (ACLITEM_GET_PRIVS(*aidata) & priv_bit)
 		{

Original file line number	Diff line number	Diff line change
`@@ -626,9 +626,9 @@ aclitemout(PG_FUNCTION_ARGS)`
`626`	`626`
`627`	`627`	`for (i = 0; i < N_ACL_RIGHTS; ++i)`
`628`	`628`	`{`
`629`		`- if (ACLITEM_GET_PRIVS(*aip) & (1 << i))`
	`629`	`+ if (ACLITEM_GET_PRIVS(*aip) & (UINT64CONST(1) << i))`
`630`	`630`	`*p++ = ACL_ALL_RIGHTS_STR[i];`
`631`		`- if (ACLITEM_GET_GOPTIONS(*aip) & (1 << i))`
	`631`	`+ if (ACLITEM_GET_GOPTIONS(*aip) & (UINT64CONST(1) << i))`
`632`	`632`	`p++ = '';`
`633`	`633`	`}`
`634`	`634`
`@@ -1786,7 +1786,7 @@ aclexplode(PG_FUNCTION_ARGS)`
`1786`	`1786`	`break;`
`1787`	`1787`	`}`
`1788`	`1788`	`aidata = &aidat[idx[0]];`
`1789`		`- priv_bit = 1 << idx[1];`
	`1789`	`+ priv_bit = UINT64CONST(1) << idx[1];`
`1790`	`1790`
`1791`	`1791`	`if (ACLITEM_GET_PRIVS(*aidata) & priv_bit)`
`1792`	`1792`	`{`