PR17731: When determining whether a tag and a non-tag were declared in the same

scope, be careful about function-scope declarations (which are not declared in
their semantic context).

llvm-svn: 193671