swift234

[Protocol conformance] Simplify/unify checking for @objc/non-@objc conflicts.

When a non-@objc witness matches an @objc requirement except for
@objc-ness, treat it the same way whether it's an optional requirement
or not, except that it's a warning for the optional case. Should
finish off rdar://problem/25159872.