Merge pull request swiftlang#38069 from xedin/rdar-79268378-5.5

[5.5][Diagnostics] Adjust `Self` conformance check to find non-decl overload choices

Author: xedin

lib/Sema/CSSimplify.cpp

@@ -6312,12 +6312,23 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
         auto requirement = signature->getRequirements()[req->getIndex()];
 
         auto *memberLoc = getConstraintLocator(anchor, path.front());
-        auto *memberRef = findResolvedMemberRef(memberLoc);
+        auto overload = findSelectedOverloadFor(memberLoc);
 
         // To figure out what is going on here we need to wait until
         // member overload is set in the constraint system.
-        if (!memberRef)
+        if (!overload) {
+          // If it's not allowed to generate new constraints
+          // there is no way to control re-activation, so this
+          // check has to fail.
+          if (!flags.contains(TMF_GenerateConstraints))
+            return SolutionKind::Error;
+
           return formUnsolved(/*activate=*/true);
+        }
+
+        auto *memberRef = overload->choice.getDeclOrNull();
+        if (!memberRef)
+          return SolutionKind::Error;
 
         // If this is a `Self` conformance requirement from a static member
         // reference on a protocol metatype, let's produce a tailored diagnostic.

validation-test/Sema/type_checker_crashers_fixed/rdar79268378.swift

@@ -0,0 +1,29 @@
+// RUN: not %target-swift-frontend %s -typecheck
+
+struct Result {
+}
+
+func wrapper(_: Result?) {
+}
+
+extension Optional where Wrapped == Result {
+  static func test(_: String) -> Result { Result() }
+}
+
+extension Result {
+  static func test<R: RangeExpression>(_: R) -> Result where R.Bound == Int {
+    Result()
+  }
+}
+
+protocol P {}
+
+struct Value : P {
+  init() {}
+  init<R>(_: R) {}
+}
+
+func example<T1: P, T2: P>(_: T1, _: T2) {
+}
+
+example(Value(), Value(wrapper(.test(0))))