earlier I fixed a bug where the BB removal pass sometimes created

invalid IR. the fix was incomplete, this one is better and is believed
to be complete

Differential Revision: https://reviews.llvm.org/D131132