Sema: Pass DeclContext down to check{Copyable,Escapable}Conformance()

Author: slavapestov

lib/Sema/TypeCheckInvertible.cpp

@@ -149,7 +149,8 @@ static void tryEmitContainmentFixits(InFlightDiagnostic &&diag,
 }
 
 /// MARK: conformance checking
-static bool checkInvertibleConformanceCommon(ProtocolConformance *conformance,
+static bool checkInvertibleConformanceCommon(DeclContext *dc,
+                                             ProtocolConformance *conformance,
                                              InvertibleProtocolKind ip) {
   const auto kp = getKnownProtocolKind(ip);
   auto *proto = conformance->getProtocol();
@@ -170,7 +171,7 @@ static bool checkInvertibleConformanceCommon(ProtocolConformance *conformance,
   // written in an extension, then we do not raise an error.
   auto inverseMarking = nom->hasInverseMarking(ip);
   if (inverseMarking.isAnyExplicit()) {
-    if (conformance->getDeclContext() == nom) {
+    if (dc == nom) {
       ctx.Diags.diagnose(inverseMarking.getLoc(),
                          diag::inverse_but_also_conforms,
                          nom, getProtocolName(kp));
@@ -260,20 +261,21 @@ static bool checkInvertibleConformanceCommon(ProtocolConformance *conformance,
   // This nominal cannot conform to IP if it contains storage that does not
   // conform to IP.
   bool lacksMatchingStorage =
-      LacksMatchingStorage(nom, conformance->getDeclContext(),
-                           ip, /*diagnose=*/true).visit();
+      LacksMatchingStorage(nom, dc, ip, /*diagnose=*/true).visit();
   conforms &= !lacksMatchingStorage;
 
   return conforms;
 }
 
-bool swift::checkEscapableConformance(ProtocolConformance *conformance) {
-  return checkInvertibleConformanceCommon(conformance,
+bool swift::checkEscapableConformance(DeclContext *dc,
+                                      ProtocolConformance *conformance) {
+  return checkInvertibleConformanceCommon(dc, conformance,
                                           InvertibleProtocolKind::Escapable);
 }
 
-bool swift::checkCopyableConformance(ProtocolConformance *conformance) {
-  return checkInvertibleConformanceCommon(conformance,
+bool swift::checkCopyableConformance(DeclContext *dc,
+                                     ProtocolConformance *conformance) {
+  return checkInvertibleConformanceCommon(dc, conformance,
                                           InvertibleProtocolKind::Copyable);
 }
 

lib/Sema/TypeCheckInvertible.h

@@ -31,11 +31,13 @@ class StorageVisitor {
   virtual ~StorageVisitor() = default;
 };
 
-/// \returns true if the conformance to Copyable was successfully validated.
-bool checkCopyableConformance(ProtocolConformance *conformance);
+/// Checks that all stored properties or associated values are Copyable.
+bool checkCopyableConformance(DeclContext *dc,
+                              ProtocolConformance *conformance);
 
-/// \returns true if the conformance to Escapable was successfully validated.
-bool checkEscapableConformance(ProtocolConformance *conformance);
+/// Checks that all stored properties or associated values are Escapable.
+bool checkEscapableConformance(DeclContext *dc,
+                               ProtocolConformance *conformance);
 }
 
 

lib/Sema/TypeCheckProtocol.cpp

@@ -6106,10 +6106,10 @@ void TypeChecker::checkConformancesInContext(IterableDeclContext *idc) {
       tryDiagnoseExecutorConformance(Context, nominal, proto);
     } else if (NoncopyableGenerics
         && proto->isSpecificProtocol(KnownProtocolKind::Copyable)) {
-      checkCopyableConformance(conformance);
+      checkCopyableConformance(dc, conformance);
     } else if (NoncopyableGenerics
         && proto->isSpecificProtocol(KnownProtocolKind::Escapable)) {
-      checkEscapableConformance(conformance);
+      checkEscapableConformance(dc, conformance);
     } else if (Context.LangOpts.hasFeature(Feature::BitwiseCopyable) &&
                proto->isSpecificProtocol(KnownProtocolKind::BitwiseCopyable)) {
       checkBitwiseCopyableConformance(