keith.walker.arm added a comment. I believe this change is good as a general back-stop check. I will look into whether using getFirstNonPHIOrDbg() would allow us to add debug data to a catchswitch as a separate improvement. https://reviews.llvm.org/D24797