SILGen: Fix property descriptor emission when enable-private-imports is enabled

Author: aschwaighofer

lib/SILGen/SILGen.cpp

@@ -1380,14 +1380,10 @@ static bool canStorageUseTrivialDescriptor(SILGenModule &SGM,
     auto setter = decl->getSetter();
     if (setter == nullptr)
       return true;
-    
-    auto setterLinkage = SILDeclRef(setter, SILDeclRef::Kind::Func)
-      .getLinkage(NotForDefinition);
-    
-    if (setterLinkage == SILLinkage::PublicExternal
-        || setterLinkage == SILLinkage::Public)
+
+    if (setter->getFormalAccessScope(nullptr, true).isPublic())
       return true;
-    
+
     return false;
   }
   case ResilienceStrategy::Resilient: {

test/SILGen/keypath_property_descriptors.swift

@@ -1,5 +1,6 @@
 // RUN: %target-swift-emit-silgen %s | %FileCheck --check-prefix=CHECK --check-prefix=NONRESILIENT %s
 // RUN: %target-swift-emit-silgen -enable-library-evolution %s | %FileCheck --check-prefix=CHECK --check-prefix=RESILIENT %s
+// RUN: %target-swift-emit-silgen -enable-private-imports %s | %FileCheck --check-prefix=PRIVATEIMPORTS %s
 
 // TODO: globals should get descriptors
 public var a: Int = 0
@@ -12,30 +13,38 @@ internal var c: Int = 0
 
 // no descriptor
 // CHECK-NOT: sil_property #d
+// PRIVATEIMPORTS-NOT: sil_property #d
 internal var d: Int = 0
 // CHECK-NOT: sil_property #e
+// PRIVATEIMPORTS-NOT: sil_property #e
 private var e: Int = 0
 
 public struct A {
   // NONRESILIENT-LABEL: sil_property #A.a ()
   // RESILIENT-LABEL: sil_property #A.a (stored_property
+	// PRIVATEIMPORTS-LABEL: sil_property #A.a ()
   public var a: Int = 0
 
   // CHECK-LABEL: sil_property #A.b ()
+	// PRIVATEIMPORTS-LABEL: sil_property #A.b ()
   @inlinable
   public var b: Int { return 0 }
 
   // NONRESILIENT-LABEL: sil_property #A.c ()
   // RESILIENT-LABEL: sil_property #A.c (stored_property
+  // PRIVATEIMPORTS-LABEL: sil_property #A.c ()
   @usableFromInline
   internal var c: Int = 0
 
   // no descriptor
   // CHECK-NOT: sil_property #A.d
+  // PRIVATEIMPORTS-LABEL: sil_property #A.d ()
   internal var d: Int = 0
   // CHECK-NOT: sil_property #A.e
+  // PRIVATEIMPORTS-LABEL: sil_property #A.e ()
   fileprivate var e: Int = 0
   // CHECK-NOT: sil_property #A.f
+  // PRIVATEIMPORTS-LABEL: sil_property #A.f ()
   private var f: Int = 0
 
   // TODO: static vars should get descriptors
@@ -99,19 +108,33 @@ public struct A {
   private var _count: Int = 0
 
   // NONRESILIENT-LABEL: sil_property #A.getSet ()
+  // PRIVATEIMPORTS-LABEL: sil_property #A.getSet ()
   // RESILIENT-LABEL: sil_property #A.getSet (settable_property
   public var getSet: Int {
     get { return 0 }
     set { }
   }
 
   // CHECK-LABEL: sil_property #A.hiddenSetter (settable_property
+  // PRIVATEIMPORTS-LABEL: sil_property #A.hiddenSetter (settable_property
   public internal(set) var hiddenSetter: Int {
     get { return 0 }
     set { }
   }
 
+  // PRIVATEIMPORTS-LABEL: sil_property #A.privateSetter (settable_property
+  public private(set) var privateSetter: Int {
+    get { return 0 }
+    set { }
+  }
+  // PRIVATEIMPORTS-LABEL: sil_property #A.fileprivateSetter (settable_property
+  public fileprivate(set) var fileprivateSetter: Int {
+    get { return 0 }
+    set { }
+  }
+
   // NONRESILIENT-LABEL: sil_property #A.usableFromInlineSetter ()
+  // PRIVATEIMPORTS-LABEL: sil_property #A.usableFromInlineSetter ()
   // RESILIENT-LABEL: sil_property #A.usableFromInlineSetter (settable_property
   public internal(set) var usableFromInlineSetter: Int {
     get { return 0 }

test/stdlib/Inputs/KeyPathMultiModule_b.swift

@@ -36,6 +36,16 @@ public struct A {
     set { }
   }
 
+  public internal(set) var w: Int {
+    get { return 0 }
+    set { }
+  }
+  public fileprivate(set) var v: Int {
+    get { return 0 }
+    set { }
+  }
+
+
   public let immutable: Int = 1738
 }
 
@@ -90,6 +100,14 @@ public func A_z_keypath() -> KeyPath<A, Int> {
   return \A.z
 }
 
+public func A_w_keypath() -> KeyPath<A, Int> {
+  return \A.w
+}
+
+public func A_v_keypath() -> KeyPath<A, Int> {
+  return \A.v
+}
+
 public func A_immutable_keypath() -> KeyPath<A, Int> {
   return \A.immutable
 }

test/stdlib/KeyPathMultiModule.swift

@@ -54,6 +54,8 @@ keyPathMultiModule.test("identity across multiple modules") {
     expectEqualWithHashes(A_x_keypath(), \A.x)
     expectEqualWithHashes(A_y_keypath(), \A.y)
     expectEqualWithHashes(A_z_keypath(), \A.z)
+    expectEqualWithHashes(A_w_keypath(), \A.w)
+    expectEqualWithHashes(A_v_keypath(), \A.v)
     expectEqualWithHashes(A_immutable_keypath(), \A.immutable)
     expectEqualWithHashes(A_subscript_withGeneric_keypath(index: 0), \A.[withGeneric: 0])
     expectEqualWithHashes(A_subscript_withGeneric_keypath(index: "butt"),