Merge pull request #30040 from xedin/sr-11743

[ConstraintSystem] Look through l-value while checking whether dynami…

Author: xedin

lib/Sema/CSSimplify.cpp

@@ -5571,7 +5571,15 @@ static bool isSelfRecursiveKeyPathDynamicMemberLookup(
       return baseDecl == keyPathRootDecl;
     }
 
-    if (baseTy->isEqual(keyPathRootTy))
+    // Previous base type could be r-value because that could be
+    // a base type of subscript "as written" for which we attempt
+    // a dynamic member lookup.
+    auto baseTy1 = baseTy->getRValueType();
+    // Root type of key path is always wrapped in an l-value
+    // before lookup is performed, so we need to unwrap that.
+    auto baseTy2 = keyPathRootTy->getRValueType();
+
+    if (baseTy1->isEqual(baseTy2))
       return true;
   }
 
@@ -5893,6 +5901,10 @@ performMemberLookup(ConstraintKind constraintKind, DeclNameRef memberName,
       using KPDynamicMemberElt = LocatorPathElt::KeyPathDynamicMember;
       if (auto kpElt = memberLocator->getLastElementAs<KPDynamicMemberElt>()) {
         auto *keyPath = kpElt->getKeyPathDecl();
+        if (isSelfRecursiveKeyPathDynamicMemberLookup(*this, baseTy,
+                                                      memberLocator))
+          return;
+
         if (auto *storage = dyn_cast<AbstractStorageDecl>(decl)) {
           // If this is an attempt to access read-only member via
           // writable key path, let's fail this choice early.

test/Constraints/keypath_dynamic_member_lookup.swift

@@ -483,3 +483,28 @@ func testDynamicMemberWithDefault(_ x: SR_11933) {
   // CHECK: [[OUTER_KP:%[0-9]+]] = keypath $KeyPath<SR_11933, Int>, (root $SR_11933; gettable_property $Int,  id @$s29keypath_dynamic_member_lookup8SR_11933V0B6MemberSis7KeyPathCyAA21HasDefaultedSubscriptVSiG_tcig : $@convention(method) (@guaranteed KeyPath<HasDefaultedSubscript, Int>, SR_11933) -> Int, getter @$s29keypath_dynamic_member_lookup8SR_11933V0B6MemberSis7KeyPathCyAA21HasDefaultedSubscriptVSiG_tcipACTK : $@convention(thin) (@in_guaranteed SR_11933, UnsafeRawPointer) -> @out Int, indices [%$0 : $KeyPath<HasDefaultedSubscript, Int> : $KeyPath<HasDefaultedSubscript, Int>], indices_equals @$ss7KeyPathCy29keypath_dynamic_member_lookup21HasDefaultedSubscriptVSiGTH : $@convention(thin) (UnsafeRawPointer, UnsafeRawPointer) -> Bool, indices_hash @$ss7KeyPathCy29keypath_dynamic_member_lookup21HasDefaultedSubscriptVSiGTh : $@convention(thin) (UnsafeRawPointer) -> Int) ([[INNER_KP]])
   _ = \SR_11933.[]
 }
+
+// SR-11743 - KeyPath Dynamic Member Lookup crash
+@dynamicMemberLookup
+protocol SR_11743_P {
+  subscript(dynamicMember member: KeyPath<Self, Any>) -> Any { get }
+}
+
+extension SR_11743_P {
+  subscript(dynamicMember member: KeyPath<Self, Any>) -> Any {
+    self[keyPath: member] // Ok
+    // CHECK: function_ref @swift_getAtKeyPath
+    // CHECK-NEXT: apply %{{.*}}<Self, Any>({{.*}})
+  }
+}
+
+@dynamicMemberLookup
+struct SR_11743_Struct {
+  let value: Int
+
+  subscript<T>(dynamicMember member: KeyPath<Self, T>) -> T {
+    return self[keyPath: member]
+    // CHECK: function_ref @swift_getAtKeyPath
+    // CHECK-NEXT: apply %{{.*}}<SR_11743_Struct, T>({{.*}})
+  }
+}