swift234

Staging: Guard private discriminators under -enable-primary-discriminators.

...rather than let this series of out-of-tree commits get any bigger.

Swift SVN r21601