As noted by Tom Lane, the previous coding in this area, which I
introduced in commit bbb6e559, was
poorly tested and caused the vacuum's second heap to go into what would
have been an infinite loop but for the fact that it eventually caused a
memory allocation failure.  This version seems to work better.