tree 6b74f9bc0f5e961271586b2d10c9df45381b08c8
parent 7b4362ec118bb69d0d2aaee01941cb85a36efa79
author Douglas Gregor <dgregor@apple.com> 1347573403 +0000
committer Douglas Gregor <dgregor@apple.com> 1347573403 +0000

When we substitute into the type of a function based on the
TypeSourceInfo, we may have lost some adjustments made to the type of
that function due to declaration merging. Adjust the resulting type
correspondingly. Fixes PR12948 / <rdar://problem/11552434>.


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