Merge pull request #4225 from swiftwasm/main

Author: MaxDesiatov

docs/SIL.rst

@@ -2065,7 +2065,7 @@ called a "forwarding instruction" and any use with such a user instruction a
 "forwarding use". This inference generally occurs upon instruction construction
 and as a result:
 
-* When manipulating forwarding instructions programatically, one must manually
+* When manipulating forwarding instructions programmatically, one must manually
   update their forwarded ownership since most of the time the ownership is
   stored in the instruction itself. Don't worry though because the SIL verifier
   will catch this error for you if you forget to do so!
@@ -2075,7 +2075,7 @@ and as a result:
   parsed operand.
   In some cases the forwarding ownership kind is different from the ownership kind
   of its operand. In such cases, textual SIL represents the forwarding ownership kind
-  explicity.
+  explicitly.
   Eg: ::
 
     %cast = unchecked_ref_cast %val : $Klass to $Optional<Klass>, forwarding: @unowned

include/swift/AST/DiagnosticsSema.def

@@ -274,6 +274,8 @@ ERROR(cannot_infer_closure_parameter_type,none,
        (StringRef))
 ERROR(cannot_infer_closure_type,none,
       "unable to infer closure type in the current context", ())
+ERROR(cannot_infer_empty_closure_result_type,none,
+      "cannot infer return type of empty closure", ())
 ERROR(cannot_infer_closure_result_type,none,
       "cannot infer return type for closure with multiple statements; "
       "add explicit type to disambiguate", ())

include/swift/Reflection/ReflectionContext.h

@@ -1190,28 +1190,7 @@ class ReflectionContext
     if (!ConformancesAddr)
       return "unable to read value of " + ConformancesPointerName;
 
-    auto Root = getReader().readPointer(ConformancesAddr->getResolvedAddress(),
-                                        sizeof(StoredPointer));
-    auto ReaderCount = Root->getResolvedAddress().getAddressData();
-
-    // ReaderCount will be the root pointer if the conformance cache is a
-    // ConcurrentMap. It's very unlikely that there would ever be more readers
-    // than the least valid pointer value, so compare with that to distinguish.
-    // TODO: once the old conformance cache is gone for good, remove that code.
-    uint64_t LeastValidPointerValue;
-    if (!getReader().queryDataLayout(
-            DataLayoutQueryType::DLQ_GetLeastValidPointerValue, nullptr,
-            &LeastValidPointerValue)) {
-      return std::string("unable to query least valid pointer value");
-    }
-
-    if (ReaderCount < LeastValidPointerValue)
-      IterateConformanceTable(ConformancesAddr->getResolvedAddress(), Call);
-    else {
-      // The old code has the root address at this location.
-      auto RootAddr = ReaderCount;
-      iterateConformanceTree(RootAddr, Call);
-    }
+    IterateConformanceTable(ConformancesAddr->getResolvedAddress(), Call);
     return llvm::None;
   }
 

include/swift/Reflection/RuntimeInternals.h

@@ -49,8 +49,8 @@ template <typename Runtime> struct MetadataCacheNode {
 };
 
 template <typename Runtime> struct ConcurrentHashMap {
-  typename Runtime::StoredSize ReaderCount;
-  typename Runtime::StoredSize ElementCount;
+  uint32_t ReaderCount;
+  uint32_t ElementCount;
   typename Runtime::StoredPointer Elements;
   typename Runtime::StoredPointer Indices;
   // We'll ignore the remaining fields for now....

include/swift/Runtime/Concurrent.h

@@ -812,7 +812,7 @@ struct ConcurrentReadableHashMap {
   /// the first element of a variable-length array, whose size is determined by
   /// the allocation.
   struct ElementStorage {
-    uint32_t Capacity;
+    uintptr_t Capacity : 32;
     ElemTy Elem;
 
     static ElementStorage *allocate(size_t capacity) {

include/swift/Sema/CSFix.h

@@ -2335,6 +2335,10 @@ class SpecifyClosureReturnType final : public ConstraintFix {
 
   bool diagnose(const Solution &solution, bool asNote = false) const override;
 
+  bool diagnoseForAmbiguity(CommonFixesArray commonFixes) const override {
+    return diagnose(*commonFixes.front().first);
+  }
+
   static SpecifyClosureReturnType *create(ConstraintSystem &cs,
                                           ConstraintLocator *locator);
 

lib/AST/CMakeLists.txt

@@ -74,6 +74,7 @@ add_swift_host_library(swiftAST STATIC
   ProtocolConformance.cpp
   RawComment.cpp
   RequirementEnvironment.cpp
+  RequirementMachine/ConcreteTypeWitness.cpp
   RequirementMachine/GenericSignatureQueries.cpp
   RequirementMachine/HomotopyReduction.cpp
   RequirementMachine/InterfaceType.cpp