Merge pull request #3619 from swiftwasm/release/5.5

MaxDesiatov · web-flow · commit 9bbe4417dde5 · 2021-09-30T09:21:20.000+01:00
[pull] swiftwasm-release/5.5 from release/5.5
diff --git a/include/swift-c/DependencyScan/DependencyScan.h b/include/swift-c/DependencyScan/DependencyScan.h
@@ -203,6 +203,9 @@ swiftscan_clang_detail_get_context_hash(swiftscan_module_details_t details);
 SWIFTSCAN_PUBLIC swiftscan_string_set_t *
 swiftscan_clang_detail_get_command_line(swiftscan_module_details_t details);
 
+SWIFTSCAN_PUBLIC swiftscan_string_set_t *
+swiftscan_clang_detail_get_captured_pcm_args(swiftscan_module_details_t details);
+
 //=== Batch Scan Input Functions ------------------------------------------===//
 
 /// Create an \c swiftscan_batch_scan_input_t instance.
diff --git a/include/swift/AST/ModuleDependencies.h b/include/swift/AST/ModuleDependencies.h
@@ -247,16 +247,22 @@ class ClangModuleDependenciesStorage : public ModuleDependenciesStorageBase {
   /// The file dependencies
   const std::vector<std::string> fileDependencies;
 
+  /// The swift-specific PCM arguments captured by this dependencies object
+  /// as found by the scanning action that discovered it
+  const std::vector<std::string> capturedPCMArgs;
+
   ClangModuleDependenciesStorage(
       const std::string &moduleMapFile,
       const std::string &contextHash,
       const std::vector<std::string> &nonPathCommandLine,
-      const std::vector<std::string> &fileDependencies
+      const std::vector<std::string> &fileDependencies,
+      const std::vector<std::string> &capturedPCMArgs
   ) : ModuleDependenciesStorageBase(ModuleDependenciesKind::Clang),
       moduleMapFile(moduleMapFile),
       contextHash(contextHash),
       nonPathCommandLine(nonPathCommandLine),
-      fileDependencies(fileDependencies) { }
+      fileDependencies(fileDependencies),
+      capturedPCMArgs(capturedPCMArgs) {}
 
   ModuleDependenciesStorageBase *clone() const override {
     return new ClangModuleDependenciesStorage(*this);
@@ -361,10 +367,12 @@ class ModuleDependencies {
       const std::string &moduleMapFile,
       const std::string &contextHash,
       const std::vector<std::string> &nonPathCommandLine,
-      const std::vector<std::string> &fileDependencies) {
+      const std::vector<std::string> &fileDependencies,
+      const std::vector<std::string> &capturedPCMArgs) {
     return ModuleDependencies(
         std::make_unique<ClangModuleDependenciesStorage>(
-          moduleMapFile, contextHash, nonPathCommandLine, fileDependencies));
+          moduleMapFile, contextHash, nonPathCommandLine,
+          fileDependencies, capturedPCMArgs));
   }
 
   /// Describe a placeholder dependency swift module.
diff --git a/include/swift/DependencyScan/DependencyScanImpl.h b/include/swift/DependencyScan/DependencyScanImpl.h
@@ -129,6 +129,9 @@ typedef struct {
 
   /// Options to the compile command required to build this clang modulemap
   swiftscan_string_set_t *command_line;
+
+  /// The swift-specific PCM arguments captured by this dependencies object
+  swiftscan_string_set_t *captured_pcm_args;
 } swiftscan_clang_details_t;
 
 struct swiftscan_module_details_s {
diff --git a/include/swift/DependencyScan/SerializedModuleDependencyCacheFormat.h b/include/swift/DependencyScan/SerializedModuleDependencyCacheFormat.h
@@ -46,7 +46,6 @@ const unsigned MODULE_DEPENDENCY_CACHE_FORMAT_VERSION_MINOR = 0;
 using IdentifierIDField = BCVBR<13>;
 using FileIDField = IdentifierIDField;
 using ModuleIDField = IdentifierIDField;
-using CompilerFlagField = IdentifierIDField;
 using ContextHashField = IdentifierIDField;
 
 /// A bit that indicates whether or not a module is a framework
@@ -166,7 +165,8 @@ using ClangModuleDetailsLayout =
                    FileIDField,               // moduleMapPath
                    ContextHashField,          // contextHash
                    FlagIDArrayIDField,        // commandLine
-                   FileIDArrayIDField         // fileDependencies
+                   FileIDArrayIDField,        // fileDependencies
+                   FlagIDArrayIDField         // capturedPCMArgs
                    >;
 } // namespace graph_block
 
diff --git a/lib/ClangImporter/ClangModuleDependencyScanner.cpp b/lib/ClangImporter/ClangModuleDependencyScanner.cpp
@@ -193,13 +193,16 @@ static ClangModuleDependenciesCacheImpl *getOrCreateClangImpl(
 void ClangImporter::recordModuleDependencies(
     ModuleDependenciesCache &cache,
     const FullDependenciesResult &clangDependencies) {
-  struct ModuleInfo {
-    std::string PCMPath;
-    std::string ModuleMapPath;
-  };
   auto &ctx = Impl.SwiftContext;
   auto currentSwiftSearchPathSet = ctx.getAllModuleSearchPathsSet();
 
+  // This scanner invocation's already-captured APINotes version
+  std::vector<std::string> capturedPCMArgs = {
+    "-Xcc",
+    ("-fapinotes-swift-version=" +
+     ctx.LangOpts.EffectiveLanguageVersion.asAPINotesVersionString())
+  };
+
   for (const auto &clangModuleDep : clangDependencies.DiscoveredModules) {
     // If we've already cached this information, we're done.
     if (cache.hasDependencies(
@@ -293,7 +296,8 @@ void ClangImporter::recordModuleDependencies(
         clangModuleDep.ClangModuleMapFile,
         clangModuleDep.ContextHash,
         swiftArgs,
-        fileDeps);
+        fileDeps,
+        capturedPCMArgs);
     for (const auto &moduleName : clangModuleDep.ClangModuleDeps) {
       dependencies.addModuleDependency(moduleName.ModuleName, &alreadyAddedModules);
     }
diff --git a/lib/DependencyScan/ModuleDependencyCacheSerialization.cpp b/lib/DependencyScan/ModuleDependencyCacheSerialization.cpp
@@ -447,10 +447,11 @@ bool Deserializer::readGraph(GlobalModuleDependenciesCache &cache) {
         llvm::report_fatal_error("Unexpected CLANG_MODULE_DETAILS_NODE record");
       cache.configureForTriple(getTriple());
       unsigned moduleMapPathID, contextHashID, commandLineArrayID,
-          fileDependenciesArrayID;
+               fileDependenciesArrayID, capturedPCMArgsArrayID;
       ClangModuleDetailsLayout::readRecord(Scratch, moduleMapPathID,
                                            contextHashID, commandLineArrayID,
-                                           fileDependenciesArrayID);
+                                           fileDependenciesArrayID,
+                                           capturedPCMArgsArrayID);
       auto moduleMapPath = getIdentifier(moduleMapPathID);
       if (!moduleMapPath)
         llvm::report_fatal_error("Bad module map path");
@@ -463,10 +464,15 @@ bool Deserializer::readGraph(GlobalModuleDependenciesCache &cache) {
       auto fileDependencies = getArray(fileDependenciesArrayID);
       if (!fileDependencies)
         llvm::report_fatal_error("Bad file dependencies");
+      auto capturedPCMArgs = getArray(capturedPCMArgsArrayID);
+      if (!capturedPCMArgs)
+        llvm::report_fatal_error("Bad captured PCM Args");
 
       // Form the dependencies storage object
       auto moduleDep = ModuleDependencies::forClangModule(
-          *moduleMapPath, *contextHash, *commandLineArgs, *fileDependencies);
+          *moduleMapPath, *contextHash, *commandLineArgs, *fileDependencies,
+          *capturedPCMArgs);
+
       // Add dependencies of this module
       for (const auto &moduleName : *currentModuleDependencies)
         moduleDep.addModuleDependency(moduleName);
@@ -572,6 +578,7 @@ enum ModuleIdentifierArrayKind : uint8_t {
   BridgingModuleDependencies,
   NonPathCommandLine,
   FileDependencies,
+  CapturedPCMArgs,
   LastArrayKind
 };
 
@@ -846,7 +853,8 @@ void Serializer::writeModuleInfo(ModuleDependencyID moduleID,
         getIdentifier(clangDeps->moduleMapFile),
         getIdentifier(clangDeps->contextHash),
         getArray(moduleID, ModuleIdentifierArrayKind::NonPathCommandLine),
-        getArray(moduleID, ModuleIdentifierArrayKind::FileDependencies));
+        getArray(moduleID, ModuleIdentifierArrayKind::FileDependencies),
+        getArray(moduleID, ModuleIdentifierArrayKind::CapturedPCMArgs));
 
     break;
   }
@@ -1015,6 +1023,8 @@ void Serializer::collectStringsAndArrays(
                    clangDeps->nonPathCommandLine);
           addArray(moduleID, ModuleIdentifierArrayKind::FileDependencies,
                    clangDeps->fileDependencies);
+          addArray(moduleID, ModuleIdentifierArrayKind::CapturedPCMArgs,
+                   clangDeps->capturedPCMArgs);
           break;
         }
         default:
diff --git a/lib/DependencyScan/ScanDependencies.cpp b/lib/DependencyScan/ScanDependencies.cpp
@@ -716,6 +716,10 @@ static void writeJSON(llvm::raw_ostream &out,
 
       // Command line.
       writeJSONSingleField(out, "commandLine", clangDeps->command_line, 5,
+                           /*trailingComma=*/true);
+
+      // Captured PCM arguments.
+      writeJSONSingleField(out, "capturedPCMArgs", clangDeps->captured_pcm_args, 5,
                            /*trailingComma=*/false);
     }
 
@@ -841,7 +845,6 @@ generateFullDependencyGraph(CompilerInstance &instance,
         // TODO: Once the clients are taught about the new dependency kind,
         // switch to using a bespoke kind here.
         details->kind = SWIFTSCAN_DEPENDENCY_INFO_SWIFT_TEXTUAL;
-
         details->swift_textual_details = {
             moduleInterfacePath,
             create_empty_set(),
@@ -870,7 +873,9 @@ generateFullDependencyGraph(CompilerInstance &instance,
         details->clang_details = {
             create_clone(clangDeps->moduleMapFile.c_str()),
             create_clone(clangDeps->contextHash.c_str()),
-            create_set(clangDeps->nonPathCommandLine)};
+            create_set(clangDeps->nonPathCommandLine),
+            create_set(clangDeps->capturedPCMArgs)
+        };
       }
       return details;
     };
diff --git a/lib/IRGen/GenReflection.cpp b/lib/IRGen/GenReflection.cpp
@@ -173,7 +173,19 @@ class PrintMetadataSource
 };
 
 Optional<llvm::VersionTuple>
-swift::irgen::getRuntimeVersionThatSupportsDemanglingType(CanType type) {
+getRuntimeVersionThatSupportsDemanglingType(CanType type) {
+  // The Swift 5.5 runtime is the first version able to demangle types
+  // related to concurrency.
+  bool needsConcurrency = type.findIf([](CanType t) -> bool {
+    if (auto fn = dyn_cast<AnyFunctionType>(t)) {
+      return fn->isAsync() || fn->isSendable() || fn->hasGlobalActor();
+    }
+    return false;
+  });
+  if (needsConcurrency) {
+    return llvm::VersionTuple(5, 5);
+  }
+
   // Associated types of opaque types weren't mangled in a usable form by the
   // Swift 5.1 runtime, so we needed to add a new mangling in 5.2.
   if (type->hasOpaqueArchetype()) {
@@ -192,16 +204,6 @@ swift::irgen::getRuntimeVersionThatSupportsDemanglingType(CanType type) {
     // involving them.
   }
 
-  bool needsConcurrency = type.findIf([](CanType t) -> bool {
-    if (auto fn = dyn_cast<AnyFunctionType>(t)) {
-      return fn->isAsync() || fn->isSendable() || fn->hasGlobalActor();
-    }
-    return false;
-  });
-  if (needsConcurrency) {
-    return llvm::VersionTuple(5, 5);
-  }
-
   return None;
 }
 
@@ -281,6 +283,20 @@ getTypeRefByFunction(IRGenModule &IGM,
   return {constant, 6};
 }
 
+bool swift::irgen::mangledNameIsUnknownToDeployTarget(IRGenModule &IGM,
+                                                      CanType type) {
+  if (auto runtimeCompatVersion = getSwiftRuntimeCompatibilityVersionForTarget(
+          IGM.Context.LangOpts.Target)) {
+    if (auto minimumSupportedRuntimeVersion =
+            getRuntimeVersionThatSupportsDemanglingType(type)) {
+      if (*runtimeCompatVersion < *minimumSupportedRuntimeVersion) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 static std::pair<llvm::Constant *, unsigned>
 getTypeRefImpl(IRGenModule &IGM,
                CanType type,
@@ -297,16 +313,10 @@ getTypeRefImpl(IRGenModule &IGM,
     // If the minimum deployment target's runtime demangler wouldn't understand
     // this mangled name, then fall back to generating a "mangled name" with a
     // symbolic reference with a callback function.
-    if (auto runtimeCompatVersion = getSwiftRuntimeCompatibilityVersionForTarget
-                                      (IGM.Context.LangOpts.Target)) {
-      if (auto minimumSupportedRuntimeVersion =
-              getRuntimeVersionThatSupportsDemanglingType(type)) {
-        if (*runtimeCompatVersion < *minimumSupportedRuntimeVersion) {
-          return getTypeRefByFunction(IGM, sig, type);
-        }
-      }
+    if (mangledNameIsUnknownToDeployTarget(IGM, type)) {
+      return getTypeRefByFunction(IGM, sig, type);
     }
-      
+
     break;
 
   case MangledTypeRefRole::Reflection:
diff --git a/lib/IRGen/IRGenMangler.h b/lib/IRGen/IRGenMangler.h
@@ -641,10 +641,10 @@ class IRGenMangler : public Mangle::ASTMangler {
   }
 };
 
-/// Does this type require a special minimum Swift runtime version which
-/// supports demangling it?
-Optional<llvm::VersionTuple>
-getRuntimeVersionThatSupportsDemanglingType(CanType type);
+/// Determines if the minimum deployment target's runtime demangler will not
+/// understand the mangled name for the given type.
+/// \returns true iff the target's runtime does not understand the mangled name.
+bool mangledNameIsUnknownToDeployTarget(IRGenModule &IGM, CanType type);
 
 } // end namespace irgen
 } // end namespace swift
diff --git a/lib/IRGen/MetadataRequest.cpp b/lib/IRGen/MetadataRequest.cpp
@@ -2477,7 +2477,11 @@ static bool shouldAccessByMangledName(IRGenModule &IGM, CanType type) {
   // Never access by mangled name if we've been asked not to.
   if (IGM.getOptions().DisableConcreteTypeMetadataMangledNameAccessors)
     return false;
-  
+
+  // Do not access by mangled name if the runtime won't understand it.
+  if (mangledNameIsUnknownToDeployTarget(IGM, type))
+    return false;
+
   // A nongeneric nominal type with nontrivial metadata has an accessor
   // already we can just call.
   if (auto nom = dyn_cast<NominalType>(type)) {
@@ -2487,14 +2491,7 @@ static bool shouldAccessByMangledName(IRGenModule &IGM, CanType type) {
       return false;
     }
   }
-  
-  // The Swift 5.1 runtime fails to demangle associated types of opaque types.
-  if (auto minimumSwiftVersion =
-          getRuntimeVersionThatSupportsDemanglingType(type)) {
-    return IGM.getAvailabilityContext().isContainedIn(
-        IGM.Context.getSwift5PlusAvailability(*minimumSwiftVersion));
-  }
-  
+
   return true;
 
 // The visitor below can be used to fine-tune a heuristic to decide whether
diff --git a/test/Interpreter/opaque_return_type_protocol_ext.swift b/test/Interpreter/opaque_return_type_protocol_ext.swift
@@ -4,9 +4,6 @@
 
 // REQUIRES: executable_test
 
-// FIXME: Disabled because compilation is crashing in arm64e
-// REQUIRES: rdar60734429
-
 @available(iOS 13, macOS 10.15, tvOS 13, watchOS 6, *)
 protocol P {
   associatedtype AT
diff --git a/test/ScanDependencies/module_deps.swift b/test/ScanDependencies/module_deps.swift
@@ -133,6 +133,11 @@ import SubE
 // CHECK-NEXT: "-module-name",
 // CHECK-NEXT: "C"
 
+// CHECK: "capturedPCMArgs": [
+// CHECK-NEXT:   "-Xcc",
+// CHECK-NEXT:   "-fapinotes-swift-version=4"
+// CHECK-NEXT: ]
+
 /// --------Swift module E
 // CHECK: "swift": "E"
 // CHECK-LABEL: modulePath": "E.swiftmodule"
diff --git a/tools/libSwiftScan/libSwiftScan.cpp b/tools/libSwiftScan/libSwiftScan.cpp
@@ -73,6 +73,7 @@ void swiftscan_dependency_info_details_dispose(
     swiftscan_string_dispose(details_impl->clang_details.module_map_path);
     swiftscan_string_dispose(details_impl->clang_details.context_hash);
     swiftscan_string_set_dispose(details_impl->clang_details.command_line);
+    swiftscan_string_set_dispose(details_impl->clang_details.captured_pcm_args);
     break;
   }
   delete details_impl;
@@ -345,6 +346,11 @@ swiftscan_clang_detail_get_command_line(swiftscan_module_details_t details) {
   return details->clang_details.command_line;
 }
 
+swiftscan_string_set_t *
+swiftscan_clang_detail_get_captured_pcm_args(swiftscan_module_details_t details) {
+  return details->clang_details.captured_pcm_args;
+}
+
 //=== Batch Scan Input Functions ------------------------------------------===//
 
 swiftscan_batch_scan_input_t *swiftscan_batch_scan_input_create() {
diff --git a/tools/libSwiftScan/libSwiftScan.exports b/tools/libSwiftScan/libSwiftScan.exports
@@ -24,6 +24,7 @@ swiftscan_swift_placeholder_detail_get_module_source_info_path
 swiftscan_clang_detail_get_module_map_path
 swiftscan_clang_detail_get_context_hash
 swiftscan_clang_detail_get_command_line
+swiftscan_clang_detail_get_captured_pcm_args
 swiftscan_batch_scan_input_set_modules
 swiftscan_batch_scan_entry_set_module_name
 swiftscan_batch_scan_entry_set_arguments
