---

yaml
---
r: 341747
b: refs/heads/rxwei-patch-1
c: 6025608
h: refs/heads/master
i:
  341745: 2f79b05
  341743: a5b2615

Author: slavapestov

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 768b91e4561da5122356ec45f19e55664d8e72bf
+refs/heads/rxwei-patch-1: 6025608aebe4e79d954b16592416f00e626aaac7
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/include/swift/AST/SimpleRequest.h

@@ -113,7 +113,9 @@ namespace detail {
 
   /// Extract the first, nearest source location from a tuple.
   template<unsigned Index, typename ...Types,
-           typename = typename std::enable_if<(Index < sizeof...(Types))>::type>
+           typename = typename std::enable_if<sizeof...(Types) - Index
+                                                  ? true
+                                                  : false>::type>
   SourceLoc extractNearestSourceLocTuple(const std::tuple<Types...> &value) {
     SourceLoc loc = maybeExtractNearestSourceLoc(std::get<Index>(value));
     if (loc.isValid())

branches/rxwei-patch-1/lib/Sema/TypeCheckProtocol.cpp

@@ -5473,15 +5473,3 @@ void TypeChecker::inferDefaultWitnesses(ProtocolDecl *proto) {
         req.getFirstType()->getCanonicalType(), requirementProto, *conformance);
   }
 }
-
-Type TypeChecker::getWitnessType(Type type, ProtocolDecl *protocol,
-                                 ProtocolConformanceRef conformance,
-                                 Identifier name,
-                                 Diag<> brokenProtocolDiag) {
-  Type ty = conformance.getTypeWitnessByName(type, name);
-  if (!ty &&
-      !(conformance.isConcrete() && conformance.getConcrete()->isInvalid()))
-    diagnose(protocol->getLoc(), brokenProtocolDiag);
-
-  return (!ty || ty->hasError()) ? Type() : ty;
-}

branches/rxwei-patch-1/lib/Sema/TypeCheckStmt.cpp

@@ -763,9 +763,8 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
         return nullptr;
       S->setSequenceConformance(conformance);
 
-      iteratorTy = TC.getWitnessType(sequenceType, sequenceProto, *conformance,
-                                     TC.Context.Id_Iterator,
-                                     diag::sequence_protocol_broken);
+      iteratorTy = conformance->getTypeWitnessByName(sequenceType,
+                                                     TC.Context.Id_Iterator);
       if (!iteratorTy)
         return nullptr;
 
@@ -796,7 +795,7 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
       // be around.
       auto nextResultType =
           OptionalType::get(conformance->getTypeWitnessByName(
-                                sequenceType, DC->getASTContext().Id_Element))
+                                sequenceType, TC.Context.Id_Element))
               ->getCanonicalType();
       auto *genBinding = PatternBindingDecl::createImplicit(
           TC.Context, StaticSpellingKind::None, genPat,
@@ -829,9 +828,8 @@ class StmtChecker : public StmtVisitor<StmtChecker, Stmt*> {
     if (!genConformance)
       return nullptr;
 
-    Type elementTy = TC.getWitnessType(iteratorTy, iteratorProto,
-                                       *genConformance, TC.Context.Id_Element,
-                                       diag::iterator_protocol_broken);
+    Type elementTy = genConformance->getTypeWitnessByName(iteratorTy,
+                                                        TC.Context.Id_Element);
     if (!elementTy)
       return nullptr;
 

branches/rxwei-patch-1/lib/Sema/TypeChecker.h

@@ -1536,26 +1536,6 @@ class TypeChecker final : public LazyResolver {
   /// array literals exist.
   bool requireArrayLiteralIntrinsics(SourceLoc loc);
 
-  /// Retrieve the witness type with the given name.
-  ///
-  /// \param type The type that conforms to the given protocol.
-  ///
-  /// \param protocol The protocol through which we're looking.
-  ///
-  /// \param conformance The protocol conformance.
-  ///
-  /// \param name The name of the associated type.
-  ///
-  /// \param brokenProtocolDiag Diagnostic to emit if the type cannot be
-  /// accessed.
-  ///
-  /// \return the witness type, or null if an error occurs or the type
-  /// returned would contain an ErrorType.
-  Type getWitnessType(Type type, ProtocolDecl *protocol,
-                      ProtocolConformanceRef conformance,
-                      Identifier name,
-                      Diag<> brokenProtocolDiag);
-
   /// Build a call to the witness with the given name and arguments.
   ///
   /// \param base The base expression, whose witness will be invoked.

branches/rxwei-patch-1/stdlib/public/SwiftShims/RefCount.h

@@ -1496,7 +1496,6 @@ _Static_assert(_Alignof(InlineRefCounts) == _Alignof(__swift_uintptr_t),
 #endif
 
 #if defined(_WIN32) && defined(_M_ARM64)
-#if defined(__cplusplus)
 namespace std {
 template <>
 inline void _Atomic_storage<swift::SideTableRefCountBits, 16>::_Unlock() const noexcept {
@@ -1506,6 +1505,5 @@ inline void _Atomic_storage<swift::SideTableRefCountBits, 16>::_Unlock() const n
 }
 }
 #endif
-#endif
 
 #endif

branches/rxwei-patch-1/stdlib/public/core/ContiguousArrayBuffer.swift

@@ -40,6 +40,11 @@ internal final class __EmptyArrayStorage
     return try body(UnsafeBufferPointer(start: nil, count: 0))
   }
 
+  @nonobjc
+  override internal func _getNonVerbatimBridgedCount() -> Int {
+    return 0
+  }
+
   override internal func _getNonVerbatimBridgingBuffer() -> _BridgingBuffer {
     return _BridgingBuffer(0)
   }
@@ -106,6 +111,17 @@ internal final class _ContiguousArrayStorage<
     }
   }
 
+  /// Returns the number of elements in the array.
+  ///
+  /// - Precondition: `Element` is bridged non-verbatim.
+  @nonobjc
+  override internal func _getNonVerbatimBridgedCount() -> Int {
+    _internalInvariant(
+      !_isBridgedVerbatimToObjectiveC(Element.self),
+      "Verbatim bridging should be handled separately")
+    return countAndCapacity.count
+  }
+
   /// Bridge array elements and return a new buffer that owns them.
   ///
   /// - Precondition: `Element` is bridged non-verbatim.

branches/rxwei-patch-1/stdlib/public/core/SwiftNativeNSArray.swift

@@ -232,7 +232,13 @@ extension __SwiftNativeNSArrayWithContiguousStorage : _NSArrayCore {
   /// bridging of array elements.
   @objc
   internal override var count: Int {
-    return _nativeStorage.countAndCapacity.count
+    if let bridgedStorage = _heapBufferBridged {
+      return _BridgingBuffer(bridgedStorage).count
+    }
+
+    // Check if elements are bridged verbatim.
+    return _nativeStorage._withVerbatimBridgedUnsafeBuffer { $0.count }
+      ?? _nativeStorage._getNonVerbatimBridgedCount()
   }
 }
 #else
@@ -288,6 +294,12 @@ internal class __ContiguousArrayStorageBase
       "Concrete subclasses must implement _withVerbatimBridgedUnsafeBuffer")
   }
 
+  @nonobjc
+  internal func _getNonVerbatimBridgedCount() -> Int {
+    _internalInvariantFailure(
+      "Concrete subclasses must implement _getNonVerbatimBridgedCount")
+  }
+
   internal func _getNonVerbatimBridgingBuffer() -> _BridgingBuffer {
     _internalInvariantFailure(
       "Concrete subclasses must implement _getNonVerbatimBridgingBuffer")

branches/rxwei-patch-1/stdlib/public/runtime/Metadata.cpp

@@ -31,7 +31,6 @@
 #include "llvm/Support/PointerLikeTypeTraits.h"
 #include <algorithm>
 #include <cctype>
-#include <cinttypes>
 #include <condition_variable>
 #include <new>
 #include <unordered_set>
@@ -3898,15 +3897,10 @@ void _swift_debug_verifyTypeLayoutAttribute(Metadata *type,
                                             size_t size,
                                             const char *description) {
   auto presentValue = [&](const void *value) {
-    if (size <= sizeof(uint64_t)) {
-      uint64_t intValue = 0;
-      auto ptr = reinterpret_cast<uint8_t *>(&intValue);
-#if defined(__BIG_ENDIAN__)
-      ptr += sizeof(uint64_t) - size;
-#endif
-      memcpy(ptr, value, size);
-      fprintf(stderr, "%" PRIu64 " (%#" PRIx64 ")\n", intValue, intValue);
-      fprintf(stderr, "                  ");
+    if (size < sizeof(long long)) {
+      long long intValue = 0;
+      memcpy(&intValue, value, size);
+      fprintf(stderr, "%lld (%#llx)\n                  ", intValue, intValue);
     }
     auto bytes = reinterpret_cast<const uint8_t *>(value);
     for (unsigned i = 0; i < size; ++i) {