jroelofs accepted this revision. jroelofs added a comment. This revision is now accepted and ready to land. Probably worth doing the same thing for the non-EHABI non-SJLJ implementation, too (that can of course go in a separate commit). LGTM http://reviews.llvm.org/D20320