swift234

Mangle some decl contexts properly, and fix the mangling
of some references in the swift module.



Swift SVN r939