swift

Mangling for shape requirements, and related fixes

#62016

Merged