Remove assertions that some compiler say are tautological

hlinnaka · hlinnaka · commit d63d486d6c39 · 2024-03-20T09:14:51.000+02:00
To avoid the compiler warnings: launch_backend.c:211:39: warning: comparison of constant 16 with expression of type 'BackendType' (aka 'enum BackendType') is always true [-Wtautological-constant-out-of-range-compare] launch_backend.c:233:39: warning: comparison of constant 16 with expression of type 'BackendType' (aka 'enum BackendType') is always true [-Wtautological-constant-out-of-range-compare] The point of the assertions was to fail more explicitly if someone adds a new BackendType to the end of the enum, but forgets to add it to the child_process_kinds array. It was a pretty weak assertion to begin with, because it wouldn't catch if you added a new BackendType in the middle of the enum. So let's just remove it. Per buildfarm member ayu and a few others, spotted by Tom Lane. Discussion: https://www.postgresql.org/message-id/4119680.1710913067@sss.pgh.pa.us
diff --git a/src/backend/postmaster/launch_backend.c b/src/backend/postmaster/launch_backend.c
@@ -208,7 +208,6 @@ child_process_kind child_process_kinds[] = {
 const char *
 PostmasterChildName(BackendType child_type)
 {
-	Assert(child_type >= 0 && child_type < lengthof(child_process_kinds));
 	return child_process_kinds[child_type].name;
 }
 
@@ -230,7 +229,6 @@ postmaster_child_launch(BackendType child_type,
 {
 	pid_t		pid;
 
-	Assert(child_type >= 0 && child_type < lengthof(child_process_kinds));
 	Assert(IsPostmasterEnvironment && !IsUnderPostmaster);
 
 #ifdef EXEC_BACKEND
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
@@ -326,6 +326,9 @@ extern void SwitchBackToLocalLatch(void);
 
 /*
  * MyBackendType indicates what kind of a backend this is.
+ *
+ * If you add entries, please also update the child_process_kinds array in
+ * launch_backend.c.
  */
 typedef enum BackendType
 {

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,6 @@ child_process_kind child_process_kinds[] = {`
`208`	`208`	`const char *`
`209`	`209`	`PostmasterChildName(BackendType child_type)`
`210`	`210`	`{`
`211`		`- Assert(child_type >= 0 && child_type < lengthof(child_process_kinds));`
`212`	`211`	`return child_process_kinds[child_type].name;`
`213`	`212`	`}`
`214`	`213`
`@@ -230,7 +229,6 @@ postmaster_child_launch(BackendType child_type,`
`230`	`229`	`{`
`231`	`230`	`pid_t pid;`
`232`	`231`
`233`		`- Assert(child_type >= 0 && child_type < lengthof(child_process_kinds));`
`234`	`232`	`Assert(IsPostmasterEnvironment && !IsUnderPostmaster);`
`235`	`233`
`236`	`234`	`#ifdef EXEC_BACKEND`
Original file line number	Diff line number	Diff line change
`@@ -326,6 +326,9 @@ extern void SwitchBackToLocalLatch(void);`
`326`	`326`
`327`	`327`	`/*`
`328`	`328`	`* MyBackendType indicates what kind of a backend this is.`
	`329`	`+ *`
	`330`	`+ * If you add entries, please also update the child_process_kinds array in`
	`331`	`+ * launch_backend.c.`
`329`	`332`	`*/`
`330`	`333`	`typedef enum BackendType`
`331`	`334`	`{`