Reapplies r296209 now that r296549 has fixed what really seems to be
the last problematic test.


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