tree 2a4722e3e5a4c0ece973aaee1036d54dd2e73e0d
parent d3573f09321f3078e802fe36c70f7750be71004d
author Douglas Gregor <dgregor@apple.com> 1274477108 +0000
committer Douglas Gregor <dgregor@apple.com> 1274477108 +0000

When instantiating a function declaration within a function template,
be sure to merge its parameter scope with its parent's scope. Fixes
PR7184.


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