SILGen: Correctly emit accessors synthesized to witness protocol requirements

We weren't adding them as external decls unless they were for
storage on an imported type, which meant SILGen wasn't emitting
them if the conforming type was from a different Swift source
file, or in whole-module mode, a different module. This led
to linker errors.

Instead, always add accessors to the external decl list, but
skip them in SILGen if they are contained in the DeclContext
we are currently emitting (which is a source file or module).

Note that they are still emitted with the wrong linkage, from a
resilience perspective. Clients must only ever see public
exports for getters, setters and materializeForSet emitted
because they are required by resilience or the access pattern;
'accidental' accessors synthesized for protocol conformance
should not be public.

Author: slavapestov

lib/SILGen/SILGenDecl.cpp

@@ -1135,6 +1135,16 @@ void SILGenModule::emitExternalWitnessTable(ProtocolConformance *c) {
 void SILGenModule::emitExternalDefinition(Decl *d) {
   switch (d->getKind()) {
   case DeclKind::Func: {
+    auto FD = cast<FuncDecl>(d);
+
+    // If this is a synthesized accessor for storage defined within the
+    // context we are currently emitting, we will emit the accessor when
+    // we visit the storage; skip it.
+    if (FD->getDeclContext()->isChildContextOf(M.getAssociatedContext())) {
+      assert(FD->isAccessor());
+      break;
+    }
+
     emitFunction(cast<FuncDecl>(d));
     break;
   }

lib/Sema/CodeSynthesis.cpp

@@ -864,6 +864,17 @@ void TypeChecker::synthesizeWitnessAccessorsForStorage(
   // by synthesizing the full set of accessors.
   if (!storage->hasAccessorFunctions()) {
     addTrivialAccessorsToStorage(storage, *this);
+
+    // If the storage was not imported from Objective-C, conservatively add
+    // the accessors to the ExternalDefinitions list anyway, in case the witness
+    // is in an external module.
+    if (!needsToBeRegisteredAsExternalDecl(storage)) {
+      Context.addExternalDecl(storage->getGetter());
+      if (storage->getSetter())
+        Context.addExternalDecl(storage->getSetter());
+      if (storage->getMaterializeForSetFunc())
+        Context.addExternalDecl(storage->getMaterializeForSetFunc());
+    }
     return;
   }
 

test/SILGen/struct_resilience.swift

@@ -108,3 +108,52 @@ public func functionWithMyResilientTypes(s: MySize, f: MySize -> MySize) -> MySi
 // CHECK:         return
   return f(s)
 }
+
+// Make sure we generate getters and setters for stored properties of
+// fixed-layout structs that were defined in a different module
+
+protocol PointProtocol {
+  var x: Int { get set }
+  var y: Int { get }
+}
+
+extension Point : PointProtocol {}
+
+// CHECK-LABEL: sil hidden [transparent] [thunk] @_TTWV16resilient_struct5Point17struct_resilience13PointProtocolS1_FS2_g1xSi
+// CHECK:         function_ref @_TFV16resilient_struct5Pointg1xSi
+// CHECK:         return
+
+// CHECK-LABEL: sil [transparent] [fragile] @_TFV16resilient_struct5Pointg1xSi
+// CHECK:         struct_extract %0 : $Point, #Point.x
+// CHECK:         return
+
+// CHECK-LABEL: sil hidden [transparent] [thunk] @_TTWV16resilient_struct5Point17struct_resilience13PointProtocolS1_FS2_s1xSi
+// CHECK:         function_ref @_TFV16resilient_struct5Points1xSi
+// CHECK:         return
+
+// CHECK-LABEL: sil [transparent] [fragile] @_TFV16resilient_struct5Points1xSi
+// CHECK:         [[ADDR:%.*]] = struct_element_addr {{.*}} : $*Point, #Point.x
+// CHECK:         assign %0 to [[ADDR]]
+// CHECK:         return
+
+// CHECK-LABEL: sil hidden [transparent] [thunk] @_TTWV16resilient_struct5Point17struct_resilience13PointProtocolS1_FS2_m1xSi
+// CHECK:         function_ref @_TFV16resilient_struct5Pointm1xSi
+// CHECK:         return
+
+// CHECK-LABEL: sil [transparent] [fragile] @_TFV16resilient_struct5Pointm1xSi
+// CHECK:         return
+
+// CHECK-LABEL: sil hidden [transparent] [thunk] @_TTWV16resilient_struct5Point17struct_resilience13PointProtocolS1_FS2_g1ySi
+// CHECK:         function_ref @_TFV16resilient_struct5Pointg1ySi
+// CHECK:         return
+
+// CHECK-LABEL: sil [transparent] [fragile] @_TFV16resilient_struct5Pointg1ySi
+// CHECK:         struct_extract %0 : $Point, #Point.y
+// CHECK:         return
+
+// CHECK-LABEL: sil_witness_table hidden Point: PointProtocol module struct_resilience {
+// CHECK-NEXT:    method #PointProtocol.x!getter.1: @_TTWV16resilient_struct5Point17struct_resilience13PointProtocolS1_FS2_g1xSi
+// CHECK-NEXT:    method #PointProtocol.x!setter.1: @_TTWV16resilient_struct5Point17struct_resilience13PointProtocolS1_FS2_s1xSi
+// CHECK-NEXT:    method #PointProtocol.x!materializeForSet.1: @_TTWV16resilient_struct5Point17struct_resilience13PointProtocolS1_FS2_m1xSi
+// CHECK-NEXT:    method #PointProtocol.y!getter.1: @_TTWV16resilient_struct5Point17struct_resilience13PointProtocolS1_FS2_g1ySi
+// CHECK-NEXT:  }