Re-commit changes in r237579 with fix for bug breaking windows builds.



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