ldionne accepted this revision. ldionne added a comment. This revision is now accepted and ready to land. Marshall, can you confirm that the change does not break `check-cxx-abilist` on OS X. I'm fine with the change if that's not broken. https://reviews.llvm.org/D52240