Merge from mainline for PR1693.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_21@42201 91177308-0d34-0410-b5e6-96231b3b80d8
1 file changed