Merge pull request #73260 from jckarter/external-key-path-generic-environment-binding-6.0

[6.0] IRGen: Fix key path generic environment marshalling for external property descriptors.

Author: jckarter

lib/IRGen/GenKeyPath.cpp

@@ -83,14 +83,12 @@ irgen::bindPolymorphicArgumentsFromComponentIndices(IRGenFunction &IGF,
   // The generic environment is marshaled into the end of the component
   // argument area inside the instance. Bind the generic information out of
   // the buffer.
-  if (hasSubscriptIndices) {
-    auto genericArgsSize = llvm::ConstantInt::get(IGF.IGM.SizeTy,
-      requirements.size() * IGF.IGM.getPointerSize().getValue());
+  auto genericArgsSize = llvm::ConstantInt::get(IGF.IGM.SizeTy,
+    requirements.size() * IGF.IGM.getPointerSize().getValue());
 
-    auto genericArgsOffset = IGF.Builder.CreateSub(size, genericArgsSize);
-    args =
-        IGF.Builder.CreateInBoundsGEP(IGF.IGM.Int8Ty, args, genericArgsOffset);
-  }
+  auto genericArgsOffset = IGF.Builder.CreateSub(size, genericArgsSize);
+  args =
+      IGF.Builder.CreateInBoundsGEP(IGF.IGM.Int8Ty, args, genericArgsOffset);
 
   bindFromGenericRequirementsBuffer(
       IGF, requirements,

stdlib/public/core/KeyPath.swift

@@ -2775,7 +2775,6 @@ internal func _getTypeByMangledNameInEnvironmentOrContext(
   genericEnvironmentOrContext: UnsafeRawPointer?,
   genericArguments: UnsafeRawPointer?)
   -> Any.Type? {
-
   let taggedPointer = UInt(bitPattern: genericEnvironmentOrContext)
   if taggedPointer & 1 == 0 {
     return _getTypeByMangledNameInEnvironment(name, nameLength,

test/stdlib/Inputs/KeyPathMultiModule_b.swift

@@ -1,5 +1,18 @@
 import StdlibUnittest
 
+// rdar://125886333
+public struct GenericExternalKeyPathTest<E> {
+    public private(set) var property: String {
+        get {
+            return "\(E.self)"
+        }
+        set {
+        }
+    }
+
+    public init() {}
+}
+
 public struct A {
   public var x: Int { return 0 }
 

test/stdlib/KeyPathMultiModule.swift

@@ -221,4 +221,18 @@ keyPathMultiModule.test("identity across multiple modules") {
   }
 }
 
+@inline(never) @_optimize(none)
+func testGenericExternalPropertyKeyPath<A, B, C>(
+    a: A, b: B, c: C
+) -> KeyPath<GenericExternalKeyPathTest<C>, String> {
+    return \GenericExternalKeyPathTest<C>.property
+}
+
+keyPathMultiModule.test("external generic property keypath accessed from different generic context") {
+    let kp = testGenericExternalPropertyKeyPath(a: 1, b: 1.0, c: "one")
+
+    expectEqual(GenericExternalKeyPathTest<String>()[keyPath: kp],
+                "\(String.self)")
+}
+
 runAllTests()