Fix bogus coding in WaitForBackgroundWorkerShutdown().

Some conditions resulted in "return" directly out of a PG_TRY block,
which left the exception stack dangling, and to add insult to injury
failed to restore the state of set_latch_on_sigusr1.

This is a bug only in 9.5; in HEAD it was accidentally fixed by commit
db0f6cad, which removed the surrounding PG_TRY block.  However, I (tgl)
chose to apply the patch to HEAD as well, because the old coding was
gratuitously different from WaitForBackgroundWorkerStartup(), and there
would indeed have been no bug if it were done like that to start with.

Dmitry Ivanov

Discussion: <1637882.WfYN5gPf1A@abook>

src/backend/postmaster/bgworker.c

@@ -1005,13 +1005,16 @@ WaitForBackgroundWorkerShutdown(BackgroundWorkerHandle *handle)
 
 		status = GetBackgroundWorkerPid(handle, &pid);
 		if (status == BGWH_STOPPED)
-			return status;
+			break;
 
 		rc = WaitLatch(&MyProc->procLatch,
 					   WL_LATCH_SET | WL_POSTMASTER_DEATH, 0);
 
 		if (rc & WL_POSTMASTER_DEATH)
-			return BGWH_POSTMASTER_DIED;
+		{
+			status = BGWH_POSTMASTER_DIED;
+			break;
+		}
 
 		ResetLatch(&MyProc->procLatch);
 	}