Commits
Joe Groff committed d3a790300cd
Fix merge regression. r5039 changed addTypeMemberConstraint to introduce the metatype for a type constraint on the caller's behalf, but my local git branch had independently tried to work around this. Swift SVN r5053