anna accepted this revision. anna added a comment. This revision is now accepted and ready to land. Daniel, I had written my comment while you updated the diff :). This LGTM now. I'll land this upstream on your behalf. https://reviews.llvm.org/D33243