Handle static functions being redeclared in function scope.

Fixes pr14861.

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