swift234

Use appropriate API to get the self type of a SILFunctionType.

Also update a naming convention issue by reusing the name we just
removed.

Swift SVN r26041