These diffs were in the last version of the patch in D33342, but I accidentally committed the previous rev. llvm-svn: 305793