diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 39c81b3aab..48edbb4e30 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -758,7 +758,7 @@ RegisterDynamicBackgroundWorker(BackgroundWorker *worker,
 {
 	int		slotno;
 	bool	success = false;
-	uint64	generation;
+	uint64	generation = 0;
 
 	/*
 	 * We can't register dynamic background workers from the postmaster.
diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c
index 9f1ea5b0f8..627f00b7fd 100644
--- a/src/backend/storage/ipc/dsm_impl.c
+++ b/src/backend/storage/ipc/dsm_impl.c
@@ -191,9 +191,11 @@ dsm_impl_op(dsm_op op, dsm_handle handle, uint64 request_size,
 			return dsm_impl_mmap(op, handle, request_size, impl_private,
 								 mapped_address, mapped_size, elevel);
 #endif
+		default:
+			elog(ERROR, "unexpected dynamic shared memory type: %d",
+				 dynamic_shared_memory_type);
+			return false;
 	}
-	elog(ERROR, "unexpected dynamic shared memory type: %d",
-		 dynamic_shared_memory_type);
 }
 
 /*