aheejin added a comment. @majnemer I inserted a routine to ensure a terminate pad should be a single BB in this previous pass (https://reviews.llvm.org/D46803). Do you have any other concerns here? Repository: rL LLVM https://reviews.llvm.org/D44134