Merge pull request #31111 from aschwaighofer/irgen_keypath_context_type

IRGen: Map interface to archetypes in keypath function

Author: aschwaighofer

lib/IRGen/GenKeyPath.cpp

@@ -1038,6 +1038,11 @@ emitKeyPathComponent(IRGenModule &IGM,
         // native class resilience. We never directly access ObjC-imported
         // ivars so we can disregard ObjC ivar resilience for this computation
         // and start counting at the Swift native root.
+        if (loweredClassTy.getASTType()->hasTypeParameter())
+          loweredClassTy = SILType::getPrimitiveObjectType(
+              GenericEnvironment::mapTypeIntoContext(
+                  genericEnv, loweredClassTy.getASTType())
+                  ->getCanonicalType());
         switch (getClassFieldAccess(IGM, loweredClassTy, property)) {
         case FieldAccess::ConstantDirect:
         case FieldAccess::ConstantIndirect:

test/IRGen/Inputs/ResilientBase.swift

@@ -0,0 +1,34 @@
+@propertyWrapper
+public struct Wrapper<Value> {
+  var value: Value
+
+  public init(wrappedValue: Value) {
+    self.init(initialValue: wrappedValue)
+  }
+
+  public init(initialValue: Value) {
+    value = initialValue
+  }
+
+  public var wrappedValue: Value {
+    get { fatalError("unreachable") }
+    set { fatalError("unreachable") }
+  }
+
+  public static subscript<T: AnyObject>(
+    _enclosingInstance object: T,
+    wrapped wrappedKeyPath: ReferenceWritableKeyPath<T, Value>,
+    storage storageKeyPath: ReferenceWritableKeyPath<T, Self>
+  ) -> Value {
+    get {
+      object[keyPath: storageKeyPath].value
+    }
+    set {
+      object[keyPath: storageKeyPath].value = newValue
+    }
+  }
+}
+
+open class ResilientBase {
+  public init() {}
+}

test/IRGen/keypath.swift

@@ -0,0 +1,20 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -enable-library-evolution -emit-module-path=%t/ResilientBase.swiftmodule -module-name=ResilientBase %S/Inputs/ResilientBase.swift
+// RUN: %target-swift-frontend -primary-file %s -emit-ir -I %t -profile-generate -profile-coverage-mapping
+
+// This test use to crash because we emitted a FieldAccess::NonConstantDirect for _t.
+
+import ResilientBase
+
+class TheTest {
+  func test_resilientSubclassCrasher() {
+    final class SubclassOfResilientBase<T> : ResilientBase {
+      @Wrapper var t: T
+
+      init(_ t: T) {
+        self.t = t
+      }
+    }
+    _ = SubclassOfResilientBase(0)
+  }
+}