aaron.ballman accepted this revision. aaron.ballman added a comment. This revision is now accepted and ready to land. This looks reasonable to me, once it's been formatted. Let's give @rsmith a few days to comment before committing, though. https://reviews.llvm.org/D33676