Merge pull request #3638 from swiftwasm/main

Author: MaxDesiatov

CMakeLists.txt

@@ -503,7 +503,7 @@ endif()
 # Use dispatch as the system scheduler by default.
 # For convenience, we set this to false when concurrency is disabled.
 set(SWIFT_CONCURRENCY_USES_DISPATCH FALSE)
-if(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY AND NOT SWIFT_STDLIB_SINGLE_THREADED_RUNTIME)
+if(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY AND "${SWIFT_CONCURRENCY_GLOBAL_EXECUTOR}" STREQUAL "dispatch")
   set(SWIFT_CONCURRENCY_USES_DISPATCH TRUE)
 endif()
 

docs/ABI/Mangling.rst

@@ -137,6 +137,13 @@ Globals
   global ::= type assoc-type-list 'MXA'  // generic parameter ref (HISTORICAL)
   global ::= protocol 'Mp'               // protocol descriptor
 
+  global ::= protocol 'Hr'               // protocol descriptor runtime record
+  global ::= nominal-type 'Hn'           // nominal type descriptor runtime record
+  #if SWIFT_RUNTIME_VERSION >= 5.1
+    global ::= opaque-type 'Ho'          // opaque type descriptor runtime record
+  #endif
+  global ::= protocol-conformance 'Hc'   // protocol conformance runtime record
+
   global ::= nominal-type 'Mo'           // class metadata immediate member base offset
 
   global ::= type 'MF'                   // metadata for remote mirrors: field descriptor

include/swift/AST/ASTMangler.h

@@ -252,6 +252,8 @@ class ASTMangler : public Mangler {
   std::string mangleTypeForTypeName(Type type);
 
   std::string mangleOpaqueTypeDescriptor(const OpaqueTypeDecl *decl);
+
+  std::string mangleOpaqueTypeDescriptorRecord(const OpaqueTypeDecl *decl);
 
   std::string mangleDeclType(const ValueDecl *decl);
 

include/swift/AST/Expr.h

@@ -307,12 +307,13 @@ class alignas(8) Expr : public ASTAllocated<Expr> {
     NumCaptures : 32
   );
 
-  SWIFT_INLINE_BITFIELD(ApplyExpr, Expr, 1+1+1+1+1,
+  SWIFT_INLINE_BITFIELD(ApplyExpr, Expr, 1+1+1+1+1+1,
     ThrowsIsSet : 1,
     Throws : 1,
     ImplicitlyAsync : 1,
     ImplicitlyThrows : 1,
-    NoAsync : 1
+    NoAsync : 1,
+    ShouldApplyDistributedThunk : 1
   );
 
   SWIFT_INLINE_BITFIELD_EMPTY(CallExpr, ApplyExpr);
@@ -1206,7 +1207,9 @@ class DeclRefExpr : public Expr {
   /// which are cross-actor invoked, because such calls actually go over the
   /// transport/network, and may throw from this, rather than the function
   /// implementation itself..
-  bool isImplicitlyThrows() const { return Bits.DeclRefExpr.IsImplicitlyThrows; }
+  bool isImplicitlyThrows() const {
+    return Bits.DeclRefExpr.IsImplicitlyThrows;
+  }
 
   /// Set whether this reference must account for a `throw` occurring for reasons
   /// other than the function implementation itself throwing, e.g. an
@@ -4391,7 +4394,7 @@ class ApplyExpr : public Expr {
   ///
   /// where the new closure is declared to be async.
   ///
-  /// When the application is implciitly async, the result describes
+  /// When the application is implicitly async, the result describes
   /// the actor to which we need to need to hop.
   Optional<ImplicitActorHopTarget> isImplicitlyAsync() const {
     if (!Bits.ApplyExpr.ImplicitlyAsync)
@@ -4419,6 +4422,15 @@ class ApplyExpr : public Expr {
     Bits.ApplyExpr.ImplicitlyThrows = flag;
   }
 
+  /// Informs IRGen to that this expression should be applied as its distributed
+  /// thunk, rather than invoking the function directly.
+  bool shouldApplyDistributedThunk() const {
+    return Bits.ApplyExpr.ShouldApplyDistributedThunk;
+  }
+  void setShouldApplyDistributedThunk(bool flag) {
+    Bits.ApplyExpr.ShouldApplyDistributedThunk = flag;
+  }
+
   ValueDecl *getCalledValue() const;
 
   static bool classof(const Expr *E) {

include/swift/AST/IRGenOptions.h

@@ -361,6 +361,8 @@ class IRGenOptions {
 
   unsigned WitnessMethodElimination : 1;
 
+  unsigned ConditionalRuntimeRecords : 1;
+
   unsigned InternalizeAtLink : 1;
 
   /// The number of threads for multi-threaded code generation.
@@ -422,7 +424,8 @@ class IRGenOptions {
         DisableRoundTripDebugTypes(false), DisableDebuggerShadowCopies(false),
         DisableConcreteTypeMetadataMangledNameAccessors(false),
         EnableGlobalISel(false), VirtualFunctionElimination(false),
-        WitnessMethodElimination(false), InternalizeAtLink(false),
+        WitnessMethodElimination(false), ConditionalRuntimeRecords(false),
+        InternalizeAtLink(false),
         CmdArgs(),
         SanitizeCoverage(llvm::SanitizerCoverageOptions()),
         TypeInfoFilter(TypeInfoDumpFilter::All) {}

include/swift/AST/SearchPathOptions.h

@@ -14,7 +14,6 @@
 #define SWIFT_AST_SEARCHPATHOPTIONS_H
 
 #include "swift/Basic/ArrayRefView.h"
-#include "swift/Basic/PathRemapper.h"
 #include "llvm/ADT/Hashing.h"
 
 #include <string>
@@ -98,11 +97,6 @@ class SearchPathOptions {
 
   /// A file containing modules we should perform batch scanning.
   std::string BatchScanInputFilePath;
-
-  /// Debug path mappings to apply to serialized search paths. These are
-  /// specified in LLDB from the target.source-map entries.
-  PathRemapper SearchPathRemapper;
-
 private:
   static StringRef
   pathStringFromFrameworkSearchPath(const FrameworkSearchPath &next) {

include/swift/Basic/LangOptions.h

@@ -771,9 +771,6 @@ namespace swift {
                           DisableOverlayModules,
                           EnableClangSPI);
     }
-
-    std::vector<std::string> getRemappedExtraArgs(
-        std::function<std::string(StringRef)> pathRemapCallback) const;
   };
 
 } // end namespace swift

include/swift/Demangling/DemangleNodes.def

@@ -157,6 +157,7 @@ CONTEXT_NODE(NativeOwningMutableAddressor)
 CONTEXT_NODE(NativePinningAddressor)
 CONTEXT_NODE(NativePinningMutableAddressor)
 NODE(NominalTypeDescriptor)
+NODE(NominalTypeDescriptorRecord)
 NODE(NonObjCAttribute)
 NODE(Number)
 NODE(ObjCAsyncCompletionHandlerImpl)
@@ -182,7 +183,9 @@ NODE(ProtocolConformanceRefInTypeModule)
 NODE(ProtocolConformanceRefInProtocolModule)
 NODE(ProtocolConformanceRefInOtherModule)
 NODE(ProtocolDescriptor)
+NODE(ProtocolDescriptorRecord)
 NODE(ProtocolConformanceDescriptor)
+NODE(ProtocolConformanceDescriptorRecord)
 NODE(ProtocolList)
 NODE(ProtocolListWithClass)
 NODE(ProtocolListWithAnyObject)
@@ -289,6 +292,7 @@ NODE(AccessorFunctionReference)
 NODE(OpaqueType)
 NODE(OpaqueTypeDescriptorSymbolicReference)
 NODE(OpaqueTypeDescriptor)
+NODE(OpaqueTypeDescriptorRecord)
 NODE(OpaqueTypeDescriptorAccessor)
 NODE(OpaqueTypeDescriptorAccessorImpl)
 NODE(OpaqueTypeDescriptorAccessorKey)

include/swift/Frontend/FrontendOptions.h

@@ -182,11 +182,6 @@ class FrontendOptions {
   /// module appears to not be a public module.
   Optional<bool> SerializeOptionsForDebugging;
 
-  /// When true the debug prefix map entries will be applied to debugging
-  /// options before serialization. These can be reconstructed at debug time by
-  /// applying the inverse map in SearchPathOptions.SearchPathRemapper.
-  bool DebugPrefixSerializedDebuggingOptions = false;
-
   /// When true, check if all required SwiftOnoneSupport symbols are present in
   /// the module.
   bool CheckOnoneSupportCompleteness = false;

include/swift/IRGen/Linking.h

@@ -222,10 +222,18 @@ class LinkEntity {
     /// The pointer is a NominalTypeDecl*.
     NominalTypeDescriptor,
 
+    /// The nominal type descriptor runtime record for a nominal type.
+    /// The pointer is a NominalTypeDecl*.
+    NominalTypeDescriptorRecord,
+
     /// The descriptor for an opaque type.
     /// The pointer is an OpaqueTypeDecl*.
     OpaqueTypeDescriptor,
 
+    /// The runtime record for a descriptor for an opaque type.
+    /// The pointer is an OpaqueTypeDecl*.
+    OpaqueTypeDescriptorRecord,
+
     /// The descriptor accessor for an opaque type used for dynamic functions.
     /// The pointer is an OpaqueTypeDecl*.
     OpaqueTypeDescriptorAccessor,
@@ -272,6 +280,10 @@ class LinkEntity {
     /// The pointer is a ProtocolDecl*.
     ProtocolDescriptor,
 
+    /// The protocol descriptor runtime record for a protocol type.
+    /// The pointer is a ProtocolDecl*.
+    ProtocolDescriptorRecord,
+
     /// The alias referring to the base of the requirements within the
     /// protocol descriptor, which is used to determine the offset of a
     /// particular requirement in the witness table.
@@ -372,6 +384,10 @@ class LinkEntity {
     /// The pointer is a RootProtocolConformance*.
     ProtocolConformanceDescriptor,
 
+    /// The protocol conformance descriptor runtime record for a conformance.
+    /// The pointer is a RootProtocolConformance*.
+    ProtocolConformanceDescriptorRecord,
+
     // These are both type kinds and protocol-conformance kinds.
 
     /// A lazy protocol witness accessor function. The pointer is a
@@ -481,6 +497,7 @@ class LinkEntity {
 
   static bool isRootProtocolConformanceKind(Kind k) {
     return (k == Kind::ProtocolConformanceDescriptor ||
+            k == Kind::ProtocolConformanceDescriptorRecord ||
             k == Kind::ProtocolWitnessTable);
   }
 
@@ -834,12 +851,24 @@ class LinkEntity {
     return entity;
   }
 
+  static LinkEntity forNominalTypeDescriptorRecord(NominalTypeDecl *decl) {
+    LinkEntity entity;
+    entity.setForDecl(Kind::NominalTypeDescriptorRecord, decl);
+    return entity;
+  }
+
   static LinkEntity forOpaqueTypeDescriptor(OpaqueTypeDecl *decl) {
     LinkEntity entity;
     entity.setForDecl(Kind::OpaqueTypeDescriptor, decl);
     return entity;
   }
 
+  static LinkEntity forOpaqueTypeDescriptorRecord(OpaqueTypeDecl *decl) {
+    LinkEntity entity;
+    entity.setForDecl(Kind::OpaqueTypeDescriptorRecord, decl);
+    return entity;
+  }
+
   static LinkEntity forOpaqueTypeDescriptorAccessor(OpaqueTypeDecl *decl) {
     LinkEntity entity;
     entity.setForDecl(Kind::OpaqueTypeDescriptorAccessor, decl);
@@ -902,6 +931,12 @@ class LinkEntity {
     return entity;
   }
 
+  static LinkEntity forProtocolDescriptorRecord(ProtocolDecl *decl) {
+    LinkEntity entity;
+    entity.setForDecl(Kind::ProtocolDescriptorRecord, decl);
+    return entity;
+  }
+
   static LinkEntity forProtocolRequirementsBaseDescriptor(ProtocolDecl *decl) {
     LinkEntity entity;
     entity.setForDecl(Kind::ProtocolRequirementsBaseDescriptor, decl);
@@ -1070,6 +1105,14 @@ class LinkEntity {
     return entity;
   }
 
+  static LinkEntity
+  forProtocolConformanceDescriptorRecord(const RootProtocolConformance *C) {
+    LinkEntity entity;
+    entity.setForProtocolConformance(Kind::ProtocolConformanceDescriptorRecord,
+                                     C);
+    return entity;
+  }
+
   static LinkEntity forCoroutineContinuationPrototype(CanSILFunctionType type) {
     LinkEntity entity;
     entity.setForType(Kind::CoroutineContinuationPrototype, type);