Merge pull request #68169 from xedin/rdar-67799

[ConstraintSystem] Look through specialization while simplifying cons…

Author: xedin

lib/Sema/ConstraintSystem.cpp

@@ -5724,6 +5724,13 @@ void constraints::simplifyLocator(ASTNode &anchor,
     }
 
     case ConstraintLocator::ConstructorMember:
+      // Look through specialization first, because it doesn't play a
+      // functional role here.
+      if (auto *USE = getAsExpr<UnresolvedSpecializeExpr>(anchor)) {
+        anchor = USE->getSubExpr();
+        range = anchor.getSourceRange();
+      }
+
       // - This is really an implicit 'init' MemberRef, so point at the base,
       //   i.e. the TypeExpr.
       // - For re-declarations we'd get an overloaded reference

test/Constraints/ambiguous_specialized_name_diagnostics.swift

@@ -0,0 +1,48 @@
+// RUN: %empty-directory(%t/src)
+// RUN: %empty-directory(%t/sdk)
+// RUN: split-file %s %t/src
+
+// RUN: %target-swift-frontend -emit-module %t/src/A.swift \
+// RUN:   -module-name A -swift-version 5 -enable-library-evolution \
+// RUN:   -emit-module-path %t/A.swiftmodule
+
+// RUN: %target-swift-frontend -emit-module %t/src/B.swift \
+// RUN:   -I %t -module-name B -swift-version 5 -enable-library-evolution \
+// RUN:   -emit-module-path %t/B.swiftmodule
+
+// RUN: %target-swift-frontend -typecheck %t/src/main.swift \
+// RUN:   -module-name main -I %t -verify
+
+// https://github.com/apple/swift/issues/67799
+
+//--- A.swift
+public final class S<T> {
+  public init(t: T) {
+  }
+
+  public func test() {}
+  public static func staticFn() {}
+}
+
+//--- B.swift
+public final class S<T> {
+  public init(t: T) {
+  }
+
+  public func test() {}
+  public static func staticFn() {}
+}
+
+//--- main.swift
+import A
+import B
+
+func test() {
+  _ = S<Int>(t: 42) // expected-error {{ambiguous use of 'init(t:)'}}
+
+  S<Int>(t: 42).test() // expected-error {{ambiguous use of 'init(t:)'}}
+
+  // FIXME(diagnostics): This should produce ambiguity diagnostic too
+  S<Int>.staticFn()
+  // expected-error@-1 {{generic parameter 'T' could not be inferred}}
+}