Merge pull request #40346 from DougGregor/sendable-incremental-adoption

Author: DougGregor

include/swift/AST/DiagnosticsSema.def

@@ -4601,9 +4601,9 @@ WARNING(non_sendable_keypath_access,none,
         "cannot form key path that accesses non-sendable type %0",
         (Type))
 ERROR(non_concurrent_type_member,none,
-      "%select{stored property %1|associated value %1}0 of "
-      "'Sendable'-conforming %2 %3 has non-sendable type %4",
-      (bool, DeclName, DescriptiveDeclKind, DeclName, Type))
+      "%select{stored property %2|associated value %2}1 of "
+      "'Sendable'-conforming %3 %4 has non-sendable type %0",
+      (Type, bool, DeclName, DescriptiveDeclKind, DeclName))
 ERROR(concurrent_value_class_mutable_property,none,
       "stored property %0 of 'Sendable'-conforming %1 %2 is mutable",
       (DeclName, DescriptiveDeclKind, DeclName))

lib/Sema/TypeCheckAvailability.cpp

@@ -3526,9 +3526,9 @@ void swift::diagnoseTypeAvailability(const TypeRepr *TR, Type T, SourceLoc loc,
 }
 
 static void diagnoseMissingConformance(
-    SourceLoc loc, Type type, ProtocolDecl *proto, ModuleDecl *module) {
+    SourceLoc loc, Type type, ProtocolDecl *proto, const DeclContext *fromDC) {
   assert(proto->isSpecificProtocol(KnownProtocolKind::Sendable));
-  diagnoseMissingSendableConformance(loc, type, module);
+  diagnoseMissingSendableConformance(loc, type, fromDC);
 }
 
 bool
@@ -3546,16 +3546,14 @@ swift::diagnoseConformanceAvailability(SourceLoc loc,
 
   // Diagnose "missing" conformances where we needed a conformance but
   // didn't have one.
+  auto *DC = where.getDeclContext();
   if (auto builtinConformance = dyn_cast<BuiltinProtocolConformance>(rootConf)){
     if (builtinConformance->isMissing()) {
       diagnoseMissingConformance(loc, builtinConformance->getType(),
-                                 builtinConformance->getProtocol(),
-                                 where.getDeclContext()->getParentModule());
+                                 builtinConformance->getProtocol(), DC);
     }
   }
 
-  auto *DC = where.getDeclContext();
-
   auto maybeEmitAssociatedTypeNote = [&]() {
     if (!depTy && !replacementTy)
       return;