Merge pull request #260 from postgrespro/PGPRO-7417

kovdb75 · web-flow · commit 15a3816c29ac · 2022-12-15T22:16:00.000+03:00
[PGPRO-7417] Added 'volatile' modifier for local variables
diff --git a/src/include/init.h b/src/include/init.h
@@ -171,8 +171,8 @@ void *pathman_cache_search_relid(HTAB *cache_table,
 /*
  * Save and restore PathmanInitState.
  */
-void save_pathman_init_state(PathmanInitState *temp_init_state);
-void restore_pathman_init_state(const PathmanInitState *temp_init_state);
+void save_pathman_init_state(volatile PathmanInitState *temp_init_state);
+void restore_pathman_init_state(const volatile PathmanInitState *temp_init_state);
 
 /*
  * Create main GUC variables.
diff --git a/src/init.c b/src/init.c
@@ -134,13 +134,13 @@ pathman_cache_search_relid(HTAB *cache_table,
  */
 
 void
-save_pathman_init_state(PathmanInitState *temp_init_state)
+save_pathman_init_state(volatile PathmanInitState *temp_init_state)
 {
 	*temp_init_state = pathman_init_state;
 }
 
 void
-restore_pathman_init_state(const PathmanInitState *temp_init_state)
+restore_pathman_init_state(const volatile PathmanInitState *temp_init_state)
 {
  	/*
 	 * initialization_needed is not restored: it is not just a setting but
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -796,7 +796,7 @@ add_to_pathman_config(PG_FUNCTION_ARGS)
 
 	Oid					expr_type;
 
-	PathmanInitState	init_state;
+	volatile PathmanInitState	init_state;
 
 	if (!IsPathmanReady())
 		elog(ERROR, "pg_pathman is disabled");

Original file line number	Diff line number	Diff line change
`@@ -134,13 +134,13 @@ pathman_cache_search_relid(HTAB *cache_table,`
`134`	`134`	`*/`
`135`	`135`
`136`	`136`	`void`
`137`		`-save_pathman_init_state(PathmanInitState *temp_init_state)`
	`137`	`+save_pathman_init_state(volatile PathmanInitState *temp_init_state)`
`138`	`138`	`{`
`139`	`139`	`*temp_init_state = pathman_init_state;`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`void`
`143`		`-restore_pathman_init_state(const PathmanInitState *temp_init_state)`
	`143`	`+restore_pathman_init_state(const volatile PathmanInitState *temp_init_state)`
`144`	`144`	`{`
`145`	`145`	`/*`
`146`	`146`	`* initialization_needed is not restored: it is not just a setting but`