Merge pull request #77599 from slavapestov/fix-rdar139745699

IRGen: Adjust hacks for keypaths to protocol extension members

Author: slavapestov

lib/AST/ASTMangler.cpp

@@ -343,8 +343,10 @@ std::string ASTMangler::mangleKeyPathGetterThunkHelper(
       // FIXME: This seems wrong. We used to just mangle opened archetypes as
       // their interface type. Let's make that explicit now.
       sub = sub.transformRec([](Type t) -> std::optional<Type> {
-        if (auto *openedExistential = t->getAs<OpenedArchetypeType>())
-          return openedExistential->getInterfaceType();
+        if (auto *openedExistential = t->getAs<OpenedArchetypeType>()) {
+          auto &ctx = openedExistential->getASTContext();
+          return GenericTypeParamType::getType(0, 0, ctx);
+        }
         return std::nullopt;
       });
 
@@ -377,8 +379,10 @@ std::string ASTMangler::mangleKeyPathSetterThunkHelper(
       // FIXME: This seems wrong. We used to just mangle opened archetypes as
       // their interface type. Let's make that explicit now.
       sub = sub.transformRec([](Type t) -> std::optional<Type> {
-        if (auto *openedExistential = t->getAs<OpenedArchetypeType>())
-          return openedExistential->getInterfaceType();
+        if (auto *openedExistential = t->getAs<OpenedArchetypeType>()) {
+          auto &ctx = openedExistential->getASTContext();
+          return GenericTypeParamType::getType(0, 0, ctx);
+        }
         return std::nullopt;
       });
 

lib/IRGen/GenHeap.cpp

@@ -1573,8 +1573,10 @@ class FixedBoxTypeInfoBase : public BoxTypeInfo {
       astType =
           astType
               .transformRec([](Type t) -> std::optional<Type> {
-                if (auto *openedExistential = t->getAs<OpenedArchetypeType>())
-                  return openedExistential->getInterfaceType();
+                if (auto *openedExistential = t->getAs<OpenedArchetypeType>()) {
+                  auto &ctx = openedExistential->getASTContext();
+                  return GenericTypeParamType::getType(0, 0, ctx);
+                }
                 return std::nullopt;
               })
               ->getCanonicalType();

lib/IRGen/GenKeyPath.cpp

@@ -784,8 +784,10 @@ emitKeyPathComponent(IRGenModule &IGM,
               substType = substType
                               .transformRec([](Type t) -> std::optional<Type> {
                                 if (auto *openedExistential =
-                                        t->getAs<OpenedArchetypeType>())
-                                  return openedExistential->getInterfaceType();
+                                        t->getAs<OpenedArchetypeType>()) {
+                                  auto &ctx = openedExistential->getASTContext();
+                                  return GenericTypeParamType::getType(0, 0, ctx);
+                                }
                                 return std::nullopt;
                               })
                               ->getCanonicalType();

test/IRGen/Inputs/keypath_protocol_extension_other.swift

@@ -0,0 +1,7 @@
+public protocol P<A> {
+  associatedtype A
+}
+
+extension P {
+  public var value: Bool { true }
+}

test/IRGen/keypath_protocol_extension.swift

@@ -0,0 +1,9 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module %S/Inputs/keypath_protocol_extension_other.swift -emit-module-path %t/keypath_protocol_extension_other.swiftmodule
+// RUN: %target-swift-frontend -emit-ir %s -I %t
+
+import keypath_protocol_extension_other
+
+public func foo(array: [any P<String>]) {
+  _ = array.filter(\.value)
+}