These diffs were in the last version of the patch in D33342, but I accidentally committed the previous rev. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@305793 91177308-0d34-0410-b5e6-96231b3b80d8