spatel added a comment. I think we should commit this based on fixing the miscompile alone; we can debate the other diff in a follow-on patch if needed. But let's see if @efriedma agrees. https://reviews.llvm.org/D50113