reapply john's patch, he broke mainline again by changing the test.


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