Merge pull request #78494 from DougGregor/disable-preconcurrency-import-no-effect-warning

[6.1] Disable warning about `@preconcurrency` having no effect on an import

Author: DougGregor

lib/Sema/TypeCheckConcurrency.cpp

@@ -942,24 +942,8 @@ bool swift::diagnoseSendabilityErrorBasedOn(
 }
 
 void swift::diagnoseUnnecessaryPreconcurrencyImports(SourceFile &sf) {
-  if (!shouldDiagnosePreconcurrencyImports(sf))
-    return;
-
-  ASTContext &ctx = sf.getASTContext();
-
-  if (ctx.TypeCheckerOpts.SkipFunctionBodies != FunctionBodySkipping::None)
-    return;
-
-  for (const auto &import : sf.getImports()) {
-    if (import.options.contains(ImportFlags::Preconcurrency) &&
-        import.importLoc.isValid() &&
-        !sf.hasImportUsedPreconcurrency(import)) {
-      ctx.Diags.diagnose(
-          import.importLoc, diag::remove_predates_concurrency_import,
-          import.module.importedModule->getName())
-        .fixItRemove(import.preconcurrencyRange);
-    }
-  }
+  // NOTE: Disabled in Swift 6.0.
+  return;
 }
 
 /// Produce a diagnostic for a single instance of a non-Sendable type where

test/Concurrency/predates_concurrency_import.swift

@@ -13,7 +13,6 @@
 @preconcurrency import NonStrictModule
 @_predatesConcurrency import StrictModule // expected-warning{{'@_predatesConcurrency' has been renamed to '@preconcurrency'}}
 @preconcurrency import OtherActors
-// expected-warning@-1{{'@preconcurrency' attribute on module 'OtherActors' has no effect}}{{1-17=}}
 
 @preconcurrency
 class MyPredatesConcurrencyClass { }