Recommit 69694 but this time also include the header changes (sorry for breaking
the build).


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