mcgrathr accepted this revision. mcgrathr added a comment. This revision is now accepted and ready to land. Works for me. https://reviews.llvm.org/D41277 works just as well. I don't know how you plan to reconcile the two. https://reviews.llvm.org/D39348