Fix r137086 to actually work properly in general.  PR10650.



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