Merge r128168 to unbreak test.


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