Fix a crash-on-invalid involving name lookup of tag names, where we

ended up finding a function template that we didn't expect. Recover
more gracefully, and fix a similar issue for class templates.

llvm-svn: 101040