swift234

Only strip implicit self parameter from func decl type if the func decl
has an implicit self decl. Follow-up to r29732.

Swift SVN r29742