Reapply 122341 to fix PR8199 now that clang changes are in.


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