Merge pull request #3041 from swiftwasm/main

[pull] swiftwasm from main

Author: MaxDesiatov

CHANGELOG.md

@@ -1,34 +1,30 @@
 CHANGELOG
 =========
 
-<details>
-<summary>Note: This is in reverse chronological order, so newer entries are added to the top.</summary>
-
-| Version                | Released   | Toolchain   |
-| :--------------------- | :--------- | :---------- |
-| [Swift 5.5](#swift-55) |            |             |
-| [Swift 5.4](#swift-54) |            |             |
-| [Swift 5.3](#swift-53) | 2020-09-16 | Xcode 12.0  |
-| [Swift 5.2](#swift-52) | 2020-03-24 | Xcode 11.4  |
-| [Swift 5.1](#swift-51) | 2019-09-20 | Xcode 11.0  |
-| [Swift 5.0](#swift-50) | 2019-03-25 | Xcode 10.2  |
-| [Swift 4.2](#swift-42) | 2018-09-17 | Xcode 10.0  |
-| [Swift 4.1](#swift-41) | 2018-03-29 | Xcode 9.3   |
-| [Swift 4.0](#swift-40) | 2017-09-19 | Xcode 9.0   |
-| [Swift 3.1](#swift-31) | 2017-03-27 | Xcode 8.3   |
-| [Swift 3.0](#swift-30) | 2016-09-13 | Xcode 8.0   |
-| [Swift 2.2](#swift-22) | 2016-03-21 | Xcode 7.3   |
-| [Swift 2.1](#swift-21) | 2015-10-21 | Xcode 7.1   |
-| [Swift 2.0](#swift-20) | 2015-09-17 | Xcode 7.0   |
-| [Swift 1.2](#swift-12) | 2015-04-08 | Xcode 6.3   |
-| [Swift 1.1](#swift-11) | 2014-12-02 | Xcode 6.1.1 |
-| [Swift 1.0](#swift-10) | 2014-09-15 | Xcode 6.0   |
-
-</details>
+_**Note:** This is in reverse chronological order, so newer entries are added to the top._
 
 Swift 5.5
 ---------
 
+* [SE-0306][]:
+
+  Swift 5.5 includes support for actors, a new kind of type that isolates its instance data to protect it from concurrent access. Accesses to an actor's instance declarations from outside the must be asynchronous:
+
+  ```swift
+  actor Counter {
+    var value = 0
+
+    func increment() {
+      value = value + 1
+    }
+  }
+
+  func useCounter(counter: Counter) async {
+    print(await counter.value) // interaction must be async
+    await counter.increment()  // interaction must be async
+  }
+  ```
+
 * The determination of whether a call to a `rethrows` function can throw now considers default arguments of `Optional` type.
 
   In Swift 5.4, such default arguments were ignored entirely by `rethrows` checking. This meant that the following example was accepted:
@@ -173,11 +169,11 @@ Swift 5.5
 
   The "for" loop can be used to traverse asynchronous sequences in asynchronous code:
 
-	```swift
+  ```swift
   for try await line in myFile.lines() {
     // Do something with each line
   }
-	```
+  ```
 
   Asynchronous for loops use asynchronous sequences, defined by the protocol
   `AsyncSequence` and its corresponding `AsyncIterator`.
@@ -187,6 +183,8 @@ Swift 5.5
 Swift 5.4
 ---------
 
+### 2021-04-26 (Xcode 12.5)
+
 * Protocol conformance checking now considers `where` clauses when evaluating if a `typealias` is a suitable witness for an associated type requirement. The following code is now rejected:
 
   ```swift
@@ -8434,6 +8432,7 @@ Swift 1.0
 [SE-0297]: <https://github.com/apple/swift-evolution/blob/main/proposals/0297-concurrency-objc.md>
 [SE-0298]: <https://github.com/apple/swift-evolution/blob/main/proposals/0298-asyncsequence.md>
 [SE-0299]: <https://github.com/apple/swift-evolution/blob/main/proposals/0299-extend-generic-static-member-lookup.md>
+[SE-0306]: <https://github.com/apple/swift-evolution/blob/main/proposals/0306-actors.md>
 
 [SR-75]: <https://bugs.swift.org/browse/SR-75>
 [SR-106]: <https://bugs.swift.org/browse/SR-106>

include/swift/ABI/Task.h

@@ -39,7 +39,10 @@ class TaskGroup;
 extern FullMetadata<DispatchClassMetadata> jobHeapMetadata;
 
 /// A schedulable job.
-class alignas(2 * alignof(void*)) Job : public HeapObject {
+class alignas(2 * alignof(void*)) Job :
+  // For async-let tasks, the refcount bits are initialized as "immortal"
+  // because such a task is allocated with the parent's stack allocator.
+  public HeapObject {
 public:
   // Indices into SchedulerPrivate, for use by the runtime.
   enum {
@@ -88,6 +91,14 @@ class alignas(2 * alignof(void*)) Job : public HeapObject {
     assert(isAsyncTask() && "wrong constructor for a non-task job");
   }
 
+  /// Create a job with "immortal" reference counts.
+  /// Used for async let tasks.
+  Job(JobFlags flags, TaskContinuationFunction *invoke,
+      const HeapMetadata *metadata, InlineRefCounts::Immortal_t immortal)
+      : HeapObject(metadata, immortal), Flags(flags), ResumeTask(invoke) {
+    assert(isAsyncTask() && "wrong constructor for a non-task job");
+  }
+
   bool isAsyncTask() const {
     return Flags.isAsyncTask();
   }
@@ -201,6 +212,21 @@ class AsyncTask : public Job {
     assert(flags.isAsyncTask());
   }
 
+  /// Create a task with "immortal" reference counts.
+  /// Used for async let tasks.
+  AsyncTask(const HeapMetadata *metadata, InlineRefCounts::Immortal_t immortal,
+            JobFlags flags,
+            TaskContinuationFunction *run,
+            AsyncContext *initialContext)
+    : Job(flags, run, metadata, immortal),
+      ResumeContext(initialContext),
+      Status(ActiveTaskStatus()),
+      Local(TaskLocal::Storage()) {
+    assert(flags.isAsyncTask());
+  }
+
+  ~AsyncTask();
+
   /// Given that we've already fully established the job context
   /// in the current thread, start running this task.  To establish
   /// the job context correctly, call swift_job_run or

include/swift/AST/ASTMangler.h

@@ -186,7 +186,7 @@ class ASTMangler : public Mangler {
   std::string
   mangleAutoDiffDerivativeFunction(const AbstractFunctionDecl *originalAFD,
                                    AutoDiffDerivativeFunctionKind kind,
-                                   AutoDiffConfig config,
+                                   const AutoDiffConfig &config,
                                    bool isVTableThunk = false);
 
   /// Mangle the linear map (differential/pullback) for the given:
@@ -196,7 +196,7 @@ class ASTMangler : public Mangler {
   ///   derivative generic signature.
   std::string mangleAutoDiffLinearMap(const AbstractFunctionDecl *originalAFD,
                                       AutoDiffLinearMapKind kind,
-                                      AutoDiffConfig config);
+                                      const AutoDiffConfig &config);
 
   /// Mangle the linear map self parameter reordering thunk the given:
   /// - Mangled original function declaration.
@@ -210,7 +210,7 @@ class ASTMangler : public Mangler {
   /// Mangle a SIL differentiability witness.
   std::string mangleSILDifferentiabilityWitness(StringRef originalName,
                                                 DifferentiabilityKind kind,
-                                                AutoDiffConfig config);
+                                                const AutoDiffConfig &config);
 
   /// Mangle the AutoDiff generated declaration for the given:
   /// - Generated declaration kind: linear map struct or branching trace enum.
@@ -223,7 +223,7 @@ class ASTMangler : public Mangler {
   mangleAutoDiffGeneratedDeclaration(AutoDiffGeneratedDeclarationKind declKind,
                                      StringRef origFnName, unsigned bbId,
                                      AutoDiffLinearMapKind linearMapKind,
-                                     AutoDiffConfig config);
+                                     const AutoDiffConfig &config);
 
   std::string mangleKeyPathGetterThunkHelper(const AbstractStorageDecl *property,
                                              GenericSignature signature,
@@ -453,7 +453,7 @@ class ASTMangler : public Mangler {
       const AbstractFunctionDecl *afd);
   void appendAutoDiffFunctionParts(StringRef op, 
                                    Demangle::AutoDiffFunctionKind kind,
-                                   AutoDiffConfig config);
+                                   const AutoDiffConfig &config);
   void appendIndexSubset(IndexSubset *indexSubset);
 };
 

include/swift/AST/Decl.h

@@ -5718,7 +5718,7 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
   ArrayRef<AutoDiffConfig> getDerivativeFunctionConfigurations();
 
   /// Add the given derivative function configuration.
-  void addDerivativeFunctionConfiguration(AutoDiffConfig config);
+  void addDerivativeFunctionConfiguration(const AutoDiffConfig &config);
 
 protected:
   // If a function has a body at all, we have either a parsed body AST node or

include/swift/AST/Module.h

@@ -594,9 +594,6 @@ class ModuleDecl : public DeclContext, public TypeDecl {
          ObjCSelector selector,
          SmallVectorImpl<AbstractFunctionDecl *> &results) const;
 
-  Optional<Fingerprint>
-  loadFingerprint(const IterableDeclContext *IDC) const;
-
   /// Find all SPI names imported from \p importedModule by this module,
   /// collecting the identifiers in \p spiGroups.
   void lookupImportedSPIGroups(

include/swift/Basic/Features.def

@@ -37,7 +37,7 @@
 LANGUAGE_FEATURE(StaticAssert, 0, "#assert", langOpts.EnableExperimentalStaticAssert)
 LANGUAGE_FEATURE(AsyncAwait, 296, "async/await", true)
 LANGUAGE_FEATURE(MarkerProtocol, 0, "@_marker protocol", true)
-LANGUAGE_FEATURE(Actors, 0, "actors", langOpts.EnableExperimentalConcurrency)
+LANGUAGE_FEATURE(Actors, 0, "actors", true)
 LANGUAGE_FEATURE(ConcurrentFunctions, 0, "@concurrent functions", true)
 LANGUAGE_FEATURE(RethrowsProtocol, 0, "@rethrows protocol", true)
 LANGUAGE_FEATURE(GlobalActors, 0, "Global actors", langOpts.EnableExperimentalConcurrency)

include/swift/Reflection/ReflectionContext.h

@@ -205,36 +205,7 @@ class ReflectionContext
       return false;
 
     auto Slide = ImageStart.getAddressData() - Command->vmaddr;
-    std::string Prefix = "__swift5";
-    uint64_t RangeStart = UINT64_MAX;
-    uint64_t RangeEnd = UINT64_MAX;
     auto SectionsBuf = reinterpret_cast<const char *>(Sections.get());
-    for (unsigned I = 0; I < NumSect; ++I) {
-      auto S = reinterpret_cast<typename T::Section *>(
-          SectionsBuf + (I * sizeof(typename T::Section)));
-      if (strncmp(S->sectname, Prefix.c_str(), strlen(Prefix.c_str())) != 0)
-        continue;
-      if (RangeStart == UINT64_MAX && RangeEnd == UINT64_MAX) {
-        RangeStart = S->addr + Slide;
-        RangeEnd = S->addr + S->size + Slide;
-        continue;
-      }
-      RangeStart = std::min(RangeStart, (uint64_t)S->addr + Slide);
-      RangeEnd = std::max(RangeEnd, (uint64_t)(S->addr + S->size + Slide));
-      // Keep the range rounded to 8 byte alignment on both ends so we don't
-      // introduce misaligned pointers mapping between local and remote
-      // address space.
-      RangeStart = RangeStart & ~7;
-      RangeEnd = RangeEnd + 7 & ~7;      
-    }
- 
-    if (RangeStart == UINT64_MAX && RangeEnd == UINT64_MAX)
-      return false;
-
-    auto SectBuf = this->getReader().readBytes(RemoteAddress(RangeStart),
-                                               RangeEnd - RangeStart);
-    if (!SectBuf)
-      return false;
 
     auto findMachOSectionByName = [&](llvm::StringRef Name)
         -> std::pair<RemoteRef<void>, uint64_t> {
@@ -244,11 +215,13 @@ class ReflectionContext
         if (strncmp(S->sectname, Name.data(), strlen(Name.data())) != 0)
           continue;
         auto RemoteSecStart = S->addr + Slide;
-        auto SectBufData = reinterpret_cast<const char *>(SectBuf.get());
-        auto LocalSectStart =
-            reinterpret_cast<const char *>(SectBufData + RemoteSecStart - RangeStart);
-        
-        auto StartRef = RemoteRef<void>(RemoteSecStart, LocalSectStart);
+        auto LocalSectBuf =
+            this->getReader().readBytes(RemoteAddress(RemoteSecStart), S->size);
+        if (!LocalSectBuf)
+          return {nullptr, 0};
+
+        auto StartRef = RemoteRef<void>(RemoteSecStart, LocalSectBuf.get());
+        savedBuffers.push_back(std::move(LocalSectBuf));
         return {StartRef, S->size};
       }
       return {nullptr, 0};
@@ -307,7 +280,6 @@ class ReflectionContext
     }
 
     savedBuffers.push_back(std::move(Buf));
-    savedBuffers.push_back(std::move(SectBuf));
     savedBuffers.push_back(std::move(Sections));
     return true;
   }

include/swift/SILOptimizer/Analysis/DifferentiableActivityAnalysis.h

@@ -207,7 +207,7 @@ class DifferentiableActivityInfo {
                 IndexSubset *resultIndices) const;
 
   /// Returns true if the given value is active for the given config.
-  bool isActive(SILValue value, AutoDiffConfig config) const {
+  bool isActive(SILValue value, const AutoDiffConfig &config) const {
     return isActive(value, config.parameterIndices, config.resultIndices);
   }
 
@@ -217,7 +217,7 @@ class DifferentiableActivityInfo {
                        IndexSubset *resultIndices) const;
 
   /// Returns the activity of the given value for the given config.
-  Activity getActivity(SILValue value, AutoDiffConfig config) const {
+  Activity getActivity(SILValue value, const AutoDiffConfig &config) const {
     return getActivity(value, config.parameterIndices, config.resultIndices);
   }
 
@@ -227,7 +227,7 @@ class DifferentiableActivityInfo {
             llvm::raw_ostream &s = llvm::dbgs()) const;
 
   /// Prints activity information for the config of the given value.
-  void dump(SILValue value, AutoDiffConfig config,
+  void dump(SILValue value, const AutoDiffConfig &config,
             llvm::raw_ostream &s = llvm::dbgs()) const {
     return dump(value, config.parameterIndices, config.resultIndices, s);
   }
@@ -238,7 +238,8 @@ class DifferentiableActivityInfo {
             llvm::raw_ostream &s = llvm::dbgs()) const;
 
   /// Prints all activity information for the given config.
-  void dump(AutoDiffConfig config, llvm::raw_ostream &s = llvm::dbgs()) const {
+  void dump(const AutoDiffConfig &config,
+            llvm::raw_ostream &s = llvm::dbgs()) const {
     return dump(config.parameterIndices, config.resultIndices, s);
   }
 };

include/swift/SILOptimizer/Differentiation/Common.h

@@ -121,7 +121,7 @@ void collectAllActualResultsInTypeOrder(
 /// - The set of minimal parameter and result indices for differentiating the
 ///   `apply` instruction.
 void collectMinimalIndicesForFunctionCall(
-    ApplyInst *ai, AutoDiffConfig parentConfig,
+    ApplyInst *ai, const AutoDiffConfig &parentConfig,
     const DifferentiableActivityInfo &activityInfo,
     SmallVectorImpl<SILValue> &results, SmallVectorImpl<unsigned> &paramIndices,
     SmallVectorImpl<unsigned> &resultIndices);

include/swift/SILOptimizer/Differentiation/LinearMapInfo.h

@@ -149,7 +149,7 @@ class LinearMapInfo {
 
   explicit LinearMapInfo(ADContext &context, AutoDiffLinearMapKind kind,
                          SILFunction *original, SILFunction *derivative,
-                         AutoDiffConfig config,
+                         const AutoDiffConfig &config,
                          const DifferentiableActivityInfo &activityInfo,
                          SILLoopInfo *loopInfo);