sebpop accepted this revision. sebpop added a comment. This revision is now accepted and ready to land. Very nice cleanup. Maybe you can move some more #ifdefs into __throw_* functions, although as is LGTM. Thanks! https://reviews.llvm.org/D23855