Reapply Daniel's patch to match up with llvm 63765.
Untested, Daniel or Nate please review.



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