swift234

Followup to r1819: there was an issue with that commit I hadn't spotted before related to mismatched types.  This commit solves it for FuncDecls, but not SubscriptDecls (see the FIXME).



Swift SVN r1822