Merge pull request #2197 from swiftwasm/main

[pull] swiftwasm from main

Author: pull[bot]

include/swift/AST/Decl.h

@@ -6509,6 +6509,13 @@ class ConstructorDecl : public AbstractFunctionDecl {
                   GenericParamList *GenericParams, 
                   DeclContext *Parent);
 
+  static ConstructorDecl *
+  createImported(ASTContext &ctx, ClangNode clangNode, DeclName name,
+                 SourceLoc constructorLoc, bool failable,
+                 SourceLoc failabilityLoc, bool throws, SourceLoc throwsLoc,
+                 ParameterList *bodyParams, GenericParamList *genericParams,
+                 DeclContext *parent);
+
   SourceLoc getConstructorLoc() const { return getNameLoc(); }
   SourceLoc getStartLoc() const { return getConstructorLoc(); }
   SourceRange getSourceRange() const;

include/swift/AST/DiagnosticsSema.def

@@ -1554,10 +1554,13 @@ ERROR(observingprop_requires_initializer,none,
       "non-member observing properties require an initializer", ())
 ERROR(global_requires_initializer,none,
       "global '%select{var|let}0' declaration requires an initializer expression"
-      "%select{ or getter/setter specifier|}0", (bool))
+      "%select{ or an explicitly stated getter|}0", (bool))
 ERROR(static_requires_initializer,none,
-      "%select{ERROR|'static var'|'class var'|}0 declaration requires an initializer "
-      "expression or getter/setter specifier", (StaticSpellingKind))
+      "'%select{ERROR|static|class|}0 %select{var|let}1' declaration requires "
+      "an initializer expression or an explicitly stated getter",
+      (StaticSpellingKind, bool))
+NOTE(static_requires_initializer_add_init,none,
+      "add an initializer to silence this error", ())
 ERROR(pattern_type_access,none,
       "%select{%select{variable|constant}0|property}1 "
       "%select{must be declared %select{"

include/swift/Runtime/Concurrent.h

@@ -508,8 +508,8 @@ template <class ElemTy> struct ConcurrentReadableArray {
   }
 
   void push_back(const ElemTy &elem) {
-    ScopedLock guard(WriterLock);
-    
+    Mutex::ScopedLock guard(WriterLock);
+
     auto *storage = Elements.load(std::memory_order_relaxed);
     auto count = storage ? storage->Count.load(std::memory_order_relaxed) : 0;
     if (count >= Capacity) {
@@ -594,9 +594,6 @@ struct ConcurrentReadableHashMap {
                 "Elements must not have destructors (they won't be called).");
 
 private:
-  // A scoped lock type to use on MutexTy.
-  using ScopedLockTy = ScopedLockT<MutexTy, false>;
-
   /// The reciprocal of the load factor at which we expand the table. A value of
   /// 4 means that we resize at 1/4 = 75% load factor.
   static const size_t ResizeProportion = 4;
@@ -1043,7 +1040,7 @@ struct ConcurrentReadableHashMap {
   /// The return value is ignored when `created` is `false`.
   template <class KeyTy, typename Call>
   void getOrInsert(KeyTy key, const Call &call) {
-    ScopedLockTy guard(WriterLock);
+    typename MutexTy::ScopedLock guard(WriterLock);
 
     auto indices = IndexStorage{Indices.load(std::memory_order_relaxed)};
     auto indicesCapacityLog2 = indices.getCapacityLog2();
@@ -1092,7 +1089,7 @@ struct ConcurrentReadableHashMap {
   /// Clear the hash table, freeing (when safe) all memory currently used for
   /// indices and elements.
   void clear() {
-    ScopedLockTy guard(WriterLock);
+    typename MutexTy::ScopedLock guard(WriterLock);
 
     IndexStorage indices = Indices.load(std::memory_order_relaxed);
     auto *elements = Elements.load(std::memory_order_relaxed);