We had the right logic for the nested cleanuppad case but omitted it for catchswitches. llvm-svn: 261615