postgres.git / summary / log / commit / refs

commit    d63d486d6c393817810d0477569fc657c388bfb2
Author:   Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date:     Wed Mar 20 07:14:51 2024 +0000
First released in: 17.0

    Remove assertions that some compiler say are tautological
    
    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


 src/backend/postmaster/launch_backend.c | 2 --
 src/include/miscadmin.h                 | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/backend/postmaster/launch_backend.c b/src/backend/postmaster/launch_backend.c
index 3b5f73524c0..cb0c3e2f8ab 100644
--- 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
index f900da61573..90f9b21b258 100644
--- 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
 {


[parent: 9578393bc513]