[if-converter] Handle BBs that terminate in ret during diamond conversion
This fixes https://llvm.org/PR36825.
Original patch by Valentin Churavy (D45218).
Differential Revision: https://reviews.llvm.org/D45731