Recommit r132764 since it didn't cause the windows buildbot failures.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@132776 91177308-0d34-0410-b5e6-96231b3b80d8
2 files changed