Merge pull request #36619 from slavapestov/fix-signature-rebuild-with-layout-requirement

GSB: Fix handling of layout requirements in stripBoundDependentMemberTypes()

Author: slavapestov

include/swift/AST/RequirementBase.h

@@ -63,6 +63,7 @@ class RequirementBase {
       : FirstTypeAndKind(first, kind), SecondType(second) {
     assert(first);
     assert(second);
+    assert(kind != RequirementKind::Layout);
   }
 
   /// Create a layout constraint requirement.
@@ -71,6 +72,7 @@ class RequirementBase {
       : FirstTypeAndKind(first, kind), SecondLayout(second) {
     assert(first);
     assert(second);
+    assert(kind == RequirementKind::Layout);
   }
 
   /// Determine the kind of requirement.

lib/AST/GenericSignatureBuilder.cpp

@@ -8414,7 +8414,7 @@ static Requirement stripBoundDependentMemberTypes(Requirement req) {
                        }));
 
   case RequirementKind::Layout:
-    return Requirement(RequirementKind::Conformance, subjectType,
+    return Requirement(RequirementKind::Layout, subjectType,
                        req.getLayoutConstraint());
   }
 

test/Generics/rdar75691385.swift

@@ -0,0 +1,13 @@
+// RUN: %target-typecheck-verify-swift
+// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s
+
+protocol P {}
+
+struct S : P {}
+
+struct G<T : P> {}
+
+extension G {
+  // CHECK-LABEL: Generic signature: <T, U where T == S, U : AnyObject>
+  func f<U>(_: U) where T == S, U : AnyObject {}
+}