rnk added a comment. Looks like 32-bit doesn't need to be fixed because of the way the delegation is arranged. In any case, I combined this with the re-land in https://reviews.llvm.org/D44846. PTAL Repository: rL LLVM https://reviews.llvm.org/D44876