Merge pull request #76349 from tshortli/resolve-warnings

Resolve recently introduced warnings

Author: tshortli

lib/AST/InlinableText.cpp

@@ -192,6 +192,14 @@ struct ExtractInactiveRanges : public ASTWalker {
 };
 } // end anonymous namespace
 
+#if SWIFT_BUILD_SWIFT_SYNTAX
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreturn-type-c-linkage"
+extern "C" BridgedStringRef
+swift_ASTGen_extractInlinableText(BridgedASTContext ctx,
+                                  BridgedStringRef sourceText);
+#pragma clang diagnostic pop
+#else
 /// Appends the textual contents of the provided source range, stripping
 /// the contents of comments that appear in the source.
 ///
@@ -292,10 +300,7 @@ static void appendRange(
     scratch.append(text.begin(), text.end());
   }
 }
-
-extern "C"
-BridgedStringRef swift_ASTGen_extractInlinableText(
-    BridgedASTContext ctx, BridgedStringRef sourceText);
+#endif // SWIFT_BUILD_SWIFT_SYNTAX
 
 StringRef swift::extractInlinableText(ASTContext &ctx, ASTNode node,
                                       SmallVectorImpl<char> &scratch) {

lib/Sema/ImportResolution.cpp

@@ -790,6 +790,26 @@ void UnboundImport::validateInterfaceWithPackageName(ModuleDecl *topLevelModule,
   }
 }
 
+/// Returns true if the importer and importee tuple are on an allow list for
+/// use of `@_implementationOnly import`, which is deprecated. Some existing
+/// uses of `@_implementationOnly import` cannot be safely replaced by
+/// `internal import` because the existence of the imported module must always
+/// be hidden from clients.
+static bool shouldSuppressNonResilientImplementationOnlyImportDiagnostic(
+    StringRef targetName, StringRef importerName) {
+  if (targetName == "SwiftConcurrencyInternalShims")
+    return importerName == "_Concurrency";
+
+  if (targetName == "CCryptoBoringSSL" || targetName == "CCryptoBoringSSLShims")
+    return importerName == "Crypto" || importerName == "_CryptoExtras" ||
+           importerName == "CryptoBoringWrapper";
+
+  if (targetName == "CNIOBoringSSL" || targetName == "CNIOBoringSSLShims")
+    return importerName != "NIOSSL";
+
+  return false;
+}
+
 void UnboundImport::validateResilience(NullablePtr<ModuleDecl> topLevelModule,
                                        SourceFile &SF) {
   if (!topLevelModule)
@@ -825,14 +845,8 @@ void UnboundImport::validateResilience(NullablePtr<ModuleDecl> topLevelModule,
         inFlight.fixItReplace(import.implementationOnlyRange, "internal");
       }
     } else if ( // Non-resilient client
-      !(((targetName.str() == "CCryptoBoringSSL" ||
-          targetName.str() == "CCryptoBoringSSLShims") &&
-         (importerName.str() == "Crypto" ||
-          importerName.str() == "_CryptoExtras" ||
-          importerName.str() == "CryptoBoringWrapper")) ||
-        ((targetName.str() == "CNIOBoringSSL" ||
-          targetName.str() == "CNIOBoringSSLShims") &&
-         importerName.str() == "NIOSSL"))) {
+        !shouldSuppressNonResilientImplementationOnlyImportDiagnostic(
+            targetName.str(), importerName.str())) {
       ctx.Diags.diagnose(import.importLoc,
                          diag::implementation_only_requires_library_evolution,
                          importerName);

stdlib/public/Concurrency/Actor.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Swift
-@_implementationOnly import _SwiftConcurrencyShims
 
 /// Common marker protocol providing a shared "base" for both (local) `Actor`
 /// and (potentially remote) `DistributedActor` types.

stdlib/public/Concurrency/AsyncLet.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Swift
-@_implementationOnly import _SwiftConcurrencyShims
 
 // ==== Async Let -------------------------------------------------------------
 // Only has internal / builtin functions as it is not really accessible directly

stdlib/public/Concurrency/DiscardingTaskGroup.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Swift
-@_implementationOnly import _SwiftConcurrencyShims
 
 // ==== DiscardingTaskGroup ---------------------------------------------------
 

stdlib/public/Concurrency/Errors.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Swift
-@_implementationOnly import _SwiftConcurrencyShims
 
 @available(SwiftStdlib 5.1, *)
 @_silgen_name("swift_deletedAsyncMethodError")

stdlib/public/Concurrency/GlobalConcurrentExecutor.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Swift
-@_implementationOnly import _SwiftConcurrencyShims
 
 // None of TaskExecutor APIs are available in task-to-thread concurrency model.
 #if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY

stdlib/public/Concurrency/PartialAsyncTask.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Swift
-@_implementationOnly import _SwiftConcurrencyShims
 
 // TODO(swift): rename the file to ExecutorJob.swift eventually, we don't use PartialTask terminology anymore
 

stdlib/public/Concurrency/SourceCompatibilityShims.swift

@@ -14,7 +14,6 @@
 //===----------------------------------------------------------------------===//
 
 import Swift
-@_implementationOnly import _SwiftConcurrencyShims
 
 @available(SwiftStdlib 5.1, *)
 extension Task where Success == Never, Failure == Never {

stdlib/public/Concurrency/Task+TaskExecutor.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Swift
-@_implementationOnly import _SwiftConcurrencyShims
 
 // None of TaskExecutor APIs are available in task-to-thread concurrency model.
 #if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY