Commit481018f

committed

Add macro to cast away volatile without allowing changes to underlying type

1 parent572e3e6 commit481018fCopy full SHA for 481018f

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3311,7 +3311,7 @@ pgstat_read_current_status(void)`
`3311`	`3311`	`localentry->backendStatus.st_procpid=beentry->st_procpid;`
`3312`	`3312`	`if (localentry->backendStatus.st_procpid>0)`
`3313`	`3313`	`{`
`3314`		`-memcpy(&localentry->backendStatus,(char*)beentry,sizeof(PgBackendStatus));`
	`3314`	`+memcpy(&localentry->backendStatus,unvolatize(PgBackendStatus*,beentry),sizeof(PgBackendStatus));`
`3315`	`3315`
`3316`	`3316`	`/*`
`3317`	`3317`	`* strcpy is safe even if the string is modified concurrently,`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ PMSignalShmemInit(void)`
`134`	`134`
`135`	`135`	`if (!found)`
`136`	`136`	`{`
`137`		`-MemSet(PMSignalState,0,PMSignalShmemSize());`
	`137`	`+MemSet(unvolatize(PMSignalData*,PMSignalState),0,PMSignalShmemSize());`
`138`	`138`	`PMSignalState->num_child_flags=MaxLivePostmasterChildren();`
`139`	`139`	`}`
`140`	`140`	`}`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1122,7 +1122,7 @@ typedef union PGAlignedXLogBlock`
`1122`	`1122`	`#endif`
`1123`	`1123`
`1124`	`1124`	`/*`
`1125`		`- * Macro that allows to cast constness away from an expression, but doesn't`
	`1125`	`+ * Macro that allows to cast constnessand volatileaway from an expression, but doesn't`
`1126`	`1126`	`* allow changing the underlying type. Enforcement of the latter`
`1127`	`1127`	`* currently only works for gcc like compilers.`
`1128`	`1128`	`*`
`@@ -1141,9 +1141,15 @@ typedef union PGAlignedXLogBlock`
`1141`	`1141`	`(StaticAssertExpr(__builtin_types_compatible_p(__typeof(expr), const underlying_type), \`
`1142`	`1142`	`"wrong cast"), \`
`1143`	`1143`	`(underlying_type) (expr))`
	`1144`	`+#defineunvolatize(underlying_type,expr) \`
	`1145`	`+(StaticAssertExpr(__builtin_types_compatible_p(__typeof(expr), volatile underlying_type), \`
	`1146`	`+ "wrong cast"), \`
	`1147`	`+ (underlying_type) (expr))`
`1144`	`1148`	`#else`
`1145`	`1149`	`#defineunconstify(underlying_type,expr) \`
`1146`	`1150`	`((underlying_type) (expr))`
	`1151`	`+#defineunvolatize(underlying_type,expr) \`
	`1152`	`+((underlying_type) (expr))`
`1147`	`1153`	`#endif`
`1148`	`1154`
`1149`	`1155`	`/* ----------------------------------------------------------------`

Comments

(0)