Tighten up the "cannot return array or function type" diagnostic to

say either "array type" or "function type", whichever it is. No reason
to make the user guess.

llvm-svn: 93164