hughbe accepted this revision. hughbe added a comment. This revision is now accepted and ready to land. Okay, considering this fixes the bug, I'm happy - I'll make the necessary cherry-picking and upstream pulling to Swift https://reviews.llvm.org/D29880