john.brawn accepted this revision. john.brawn added a comment. This revision is now accepted and ready to land. Given that it looks like we're already doing the same thing for phi nodes this looks like a sensible fix, so LGTM. https://reviews.llvm.org/D41251