---

yaml
---
r: 339899
b: refs/heads/rxwei-patch-1
c: a35c9f0
h: refs/heads/master
i:
  339897: 4548cd5
  339895: 668639b

Author: ikesyo

[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: 4cb6c71adfaf1b53321319376bb9bbb44ef74d24
+refs/heads/rxwei-patch-1: a35c9f0c607619285c521a6f6e7284190d3594c6
 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/ABI/Metadata.h

@@ -3121,6 +3121,10 @@ struct MetadataCompletionContext {
 /// it may be called many times as successive dependencies are resolved.
 /// If the function ever completes successfully (by returning null), it
 /// will not be called again for the same type.
+///
+/// \return null to indicate that the type has been completed, or a non-null
+///   pointer to indicate that completion is blocked on the completion of
+///   some other type
 using MetadataCompleter =
   SWIFT_CC(swift)
   MetadataDependency(const Metadata *type,

branches/rxwei-patch-1/lib/SILOptimizer/Utils/CastOptimizer.cpp

@@ -321,45 +321,17 @@ CastOptimizer::optimizeBridgedObjCToSwiftCast(SILDynamicCastInst dynamicCast) {
   auto *CCABI = cast<CheckedCastAddrBranchInst>(Inst);
   switch (CCABI->getConsumptionKind()) {
   case CastConsumptionKind::TakeAlways:
-    Builder.emitDestroyValueOperation(Loc, srcOp);
+    Builder.createReleaseValue(Loc, srcOp, Builder.getDefaultAtomicity());
     break;
   case CastConsumptionKind::TakeOnSuccess: {
-    {
-      // Insert a release in the success BB.
-      SILBuilderWithScope successBuilder(SuccessBB->begin());
-      successBuilder.emitDestroyValueOperation(Loc, srcOp);
-    }
-    {
-      // And a store in the failure BB.
-      if (Builder.hasOwnership()) {
-        SILBuilderWithScope failureBuilder(FailureBB->begin());
-        SILValue writeback = srcOp;
-        SILType srcType = src->getType().getObjectType();
-        if (writeback->getType() != srcType) {
-          writeback =
-              failureBuilder.createUncheckedRefCast(Loc, writeback, srcType);
-        }
-        failureBuilder.emitStoreValueOperation(Loc, writeback, src,
-                                               StoreOwnershipQualifier::Init);
-      }
-    }
+    // Insert a release in the success BB.
+    SILBuilderWithScope SuccessBuilder(SuccessBB->begin());
+    SuccessBuilder.emitDestroyValueOperation(Loc, srcOp);
     break;
   }
   case CastConsumptionKind::BorrowAlways:
     llvm_unreachable("checked_cast_addr_br never has BorrowAlways");
   case CastConsumptionKind::CopyOnSuccess:
-    // If we are performing copy_on_success, store the value back into memory
-    // here since we loaded it. We may need to cast back to the actual
-    // underlying type.
-    if (Builder.hasOwnership()) {
-      SILValue writeback = srcOp;
-      SILType srcType = src->getType().getObjectType();
-      if (writeback->getType() != srcType) {
-        writeback = Builder.createUncheckedRefCast(Loc, writeback, srcType);
-      }
-      Builder.emitStoreValueOperation(Loc, writeback, src,
-                                      StoreOwnershipQualifier::Init);
-    }
     break;
   }
 

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

@@ -2735,10 +2735,6 @@ void TypeChecker::addImplicitDynamicAttribute(Decl *D) {
     // Don't add dynamic to functions with a cdecl.
     if (FD->getAttrs().hasAttribute<CDeclAttr>())
       return;
-    // Don't add dynamic to local function definitions.
-    if (!FD->getDeclContext()->isTypeContext() &&
-        FD->getDeclContext()->isLocalContext())
-      return;
   }
 
   // Don't add dynamic if accessor is inlinable or tranparent.

branches/rxwei-patch-1/stdlib/public/Darwin/Foundation/Collections+DataProtocol.swift

@@ -49,7 +49,7 @@ extension Repeated: DataProtocol where Element == UInt8 {
     public typealias Regions = Repeated<Data>
 
     public var regions: Repeated<Data> {
-        guard self.count > 0 else { return repeatElement(Data(), count: 0) }
+        guard !self.isEmpty else { return repeatElement(Data(), count: 0) }
         return repeatElement(Data(CollectionOfOne(self.first!)), count: self.count)
     }
 }

branches/rxwei-patch-1/stdlib/public/Darwin/Foundation/Data.swift

@@ -639,7 +639,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
         @inlinable // This is @inlinable as a convenience initializer.
         init(_ srcBuffer: UnsafeRawBufferPointer) {
             self.init(count: srcBuffer.count)
-            if srcBuffer.count > 0 {
+            if !srcBuffer.isEmpty {
                 Swift.withUnsafeMutableBytes(of: &bytes) { dstBuffer in
                     dstBuffer.baseAddress?.copyMemory(from: srcBuffer.baseAddress!, byteCount: srcBuffer.count)
                 }
@@ -729,7 +729,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
 
         @inlinable // This is @inlinable as trivially computable.
         mutating func append(contentsOf buffer: UnsafeRawBufferPointer) {
-            guard buffer.count > 0 else { return }
+            guard !buffer.isEmpty else { return }
             assert(count + buffer.count <= MemoryLayout<Buffer>.size)
             let cnt = count
             _ = Swift.withUnsafeMutableBytes(of: &bytes) { rawBuffer in
@@ -1270,7 +1270,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
 
         @inlinable // This is @inlinable as a trivial initializer.
         init(_ buffer: UnsafeRawBufferPointer) {
-            if buffer.count == 0 {
+            if buffer.isEmpty {
                 self = .empty
             } else if InlineData.canStore(count: buffer.count) {
                 self = .inline(InlineData(buffer))
@@ -1283,7 +1283,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
 
         @inlinable // This is @inlinable as a trivial initializer.
         init(_ buffer: UnsafeRawBufferPointer, owner: AnyObject) {
-            if buffer.count == 0 {
+            if buffer.isEmpty {
                 self = .empty
             } else if InlineData.canStore(count: buffer.count) {
                 self = .inline(InlineData(buffer))
@@ -2313,7 +2313,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
     }
 
     public mutating func append(_ other: Data) {
-        guard other.count > 0 else { return }
+        guard !other.isEmpty else { return }
         other.withUnsafeBytes { (buffer: UnsafeRawBufferPointer) in
             _representation.append(contentsOf: buffer)
         }

branches/rxwei-patch-1/stdlib/public/Darwin/Foundation/URL.swift

@@ -586,7 +586,7 @@ public struct URL : ReferenceConvertible, Equatable {
     /// If the data representation is not a legal URL string as ASCII bytes, the URL object may not behave as expected. If the URL cannot be formed then this will return nil.
     @available(macOS 10.11, iOS 9.0, *)
     public init?(dataRepresentation: __shared Data, relativeTo url: __shared URL?, isAbsolute: Bool = false) {
-        guard dataRepresentation.count > 0 else { return nil }
+        guard !dataRepresentation.isEmpty else { return nil }
 
         if isAbsolute {
             _url = URL._converted(from: NSURL(absoluteURLWithDataRepresentation: dataRepresentation, relativeTo: url))

branches/rxwei-patch-1/stdlib/public/Darwin/Network/NWListener.swift

@@ -47,8 +47,8 @@ public final class NWListener: CustomDebugStringConvertible {
 			} else {
 				description = String("\(description).*")
 			}
-			if txtRecord != nil && txtRecord!.count > 0 {
-				description = String("\(description) <\(txtRecord!.count) bytes of txt>")
+			if let txtRecord = txtRecord, !txtRecord.isEmpty {
+				description = String("\(description) <\(txtRecord.count) bytes of txt>")
 			}
 			return description
 		}

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

@@ -884,7 +884,7 @@ extension Array: RangeReplaceableCollection {
     return _Buffer(_buffer: newBuffer, shiftedToStartIndex: 0)
   }
 
-  /// Construct an Array of `count` uninitialized elements.
+  /// Construct a Array of `count` uninitialized elements.
   @inlinable
   internal init(_uninitializedCount count: Int) {
     _precondition(count >= 0, "Can't construct Array with count < 0")
@@ -903,7 +903,7 @@ extension Array: RangeReplaceableCollection {
   }
 
   /// Entry point for `Array` literal construction; builds and returns
-  /// an Array of `count` uninitialized elements.
+  /// a Array of `count` uninitialized elements.
   @inlinable
   @_semantics("array.uninitialized")
   internal static func _allocateUninitialized(
@@ -936,7 +936,7 @@ extension Array: RangeReplaceableCollection {
   }
 
   /// Entry point for aborting literal construction: deallocates
-  /// an Array containing only uninitialized elements.
+  /// a Array containing only uninitialized elements.
   @inlinable
   internal mutating func _deallocateUninitialized() {
     // Set the count to zero and just release as normal.

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

@@ -89,7 +89,7 @@ public struct CollectionDifference<ChangeElement> {
   private static func _validateChanges<Changes: Collection>(
     _ changes : Changes
   ) -> Bool where Changes.Element == Change {
-    if changes.count == 0 { return true }
+    if changes.isEmpty { return true }
 
     var insertAssocToOffset = Dictionary<Int,Int>()
     var removeOffsetToAssoc = Dictionary<Int,Int>()
@@ -181,7 +181,7 @@ public struct CollectionDifference<ChangeElement> {
 
     // Find first insertion via binary search
     let firstInsertIndex: Int
-    if sortedChanges.count == 0 {
+    if sortedChanges.isEmpty {
       firstInsertIndex = 0
     } else {
       var range = 0...sortedChanges.count

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

@@ -119,7 +119,7 @@ public enum _DebuggerSupport {
     isRoot: Bool
   ) -> Bool {
     if isRoot || collectionStatus.isCollection { return true }
-    if mirror.children.count > 0 { return true }
+    if !mirror.children.isEmpty { return true }
     if mirror.displayStyle == .`class` { return true }
     if let sc = mirror.superclassMirror { return ivarCount(mirror: sc) > 0 }
     return true

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

@@ -1678,7 +1678,7 @@ extension Collection {
   internal func _makeKeyValuePairDescription<K, V>(
     withTypeName type: String? = nil
   ) -> String where Element == (key: K, value: V) {
-    if self.count == 0 {
+    if self.isEmpty {
       return "[:]"
     }
 

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

@@ -1720,7 +1720,7 @@ internal struct KeyPathBuffer {
 
     // fetch type, which is in the buffer unless it's the final component
     let nextType: Any.Type?
-    if data.count == 0 {
+    if data.isEmpty {
       nextType = nil
     } else {
       nextType = _pop(from: &data, as: Any.Type.self)
@@ -2244,7 +2244,7 @@ internal func _appendingKeyPaths<
           }
         }
 
-        _internalInvariant(destBuffer.count == 0,
+        _internalInvariant(destBuffer.isEmpty,
                      "did not fill entire result buffer")
       }
 

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

@@ -154,7 +154,7 @@ internal func validateUTF8(_ buf: UnsafeBufferPointer<UInt8>) -> UTF8ValidationR
 }
 
 internal func repairUTF8(_ input: UnsafeBufferPointer<UInt8>, firstKnownBrokenRange: Range<Int>) -> String {
-  _internalInvariant(input.count > 0, "empty input doesn't need to be repaired")
+  _internalInvariant(!input.isEmpty, "empty input doesn't need to be repaired")
   _internalInvariant(firstKnownBrokenRange.clamped(to: input.indices) == firstKnownBrokenRange)
   // During this process, `remainingInput` contains the remaining bytes to process. It's split into three
   // non-overlapping sub-regions:
@@ -176,8 +176,8 @@ internal func repairUTF8(_ input: UnsafeBufferPointer<UInt8>, firstKnownBrokenRa
   var brokenRange: Range<Int> = firstKnownBrokenRange
   var remainingInput = input
   repeat {
-    _internalInvariant(brokenRange.count > 0, "broken range empty")
-    _internalInvariant(remainingInput.count > 0, "empty remaining input doesn't need to be repaired")
+    _internalInvariant(!brokenRange.isEmpty, "broken range empty")
+    _internalInvariant(!remainingInput.isEmpty, "empty remaining input doesn't need to be repaired")
     let goodChunk = remainingInput[..<brokenRange.startIndex]
 
     // very likely this capacity reservation does not actually do anything because we reserved space for the entire
@@ -199,6 +199,6 @@ internal func repairUTF8(_ input: UnsafeBufferPointer<UInt8>, firstKnownBrokenRa
     case .error(let newBrokenRange):
       brokenRange = newBrokenRange
     }
-  } while remainingInput.count > 0
+  } while !remainingInput.isEmpty
   return String(result)
 }

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

@@ -201,7 +201,7 @@ public func _encodeBitsAsWords<T>(_ x: T) -> [Int] {
   let result = [Int](
     repeating: 0,
     count: (MemoryLayout<T>.size + MemoryLayout<Int>.size - 1) / MemoryLayout<Int>.size)
-  _internalInvariant(result.count > 0)
+  _internalInvariant(!result.isEmpty)
   var tmp = x
   // FIXME: use UnsafeMutablePointer.assign(from:) instead of memcpy.
   _memcpy(dest: UnsafeMutablePointer(result._baseAddressIfContiguous!),

branches/rxwei-patch-1/test/Prototypes/BigInt.swift

@@ -95,7 +95,7 @@ public struct _BigInt<Word: FixedWidthInteger & UnsignedInteger> :
 
   /// A Boolean value indicating whether this instance is equal to zero.
   public var isZero: Bool {
-    return _data.count == 0
+    return _data.isEmpty
   }
 
   //===--- Numeric initializers -------------------------------------------===//
@@ -212,7 +212,7 @@ public struct _BigInt<Word: FixedWidthInteger & UnsignedInteger> :
   /// - `_data` has no trailing zero elements
   /// - If `self == 0`, then `isNegative == false`
   func _checkInvariants(source: String = #function) {
-    if _data.count == 0 {
+    if _data.isEmpty {
       assert(isNegative == false,
         "\(source): isNegative with zero length _data")
     }

branches/rxwei-patch-1/test/SILGen/dynamically_replaceable.swift

@@ -367,18 +367,3 @@ var x = 10
 defer {
   let y = x
 }
-
-// IMPLICIT-LABEL: sil [dynamically_replacable] [ossa] @$s23dynamically_replaceable16testWithLocalFunyyF
-// IMPLICIT-LABEL: sil private [ossa] @$s23dynamically_replaceable16testWithLocalFunyyF05localF0L_yyF
-// IMPLICIT-LABEL: sil private [ossa] @$s23dynamically_replaceable16testWithLocalFunyyF05localF0L_yyF0geF0L_yyF
-// IMPLICIT-LABEL: sil private [ossa] @$s23dynamically_replaceable16testWithLocalFunyyFyycfU_
-public func testWithLocalFun() {
-  func localFun() {
-    func localLocalFun() { print("bar") }
-    print("foo")
-    localLocalFun()
-  }
-  localFun()
-  let unamedClosure = { print("foo") }
-  unamedClosure()
-}

branches/rxwei-patch-1/test/SILOptimizer/constant_propagation_objc.sil

@@ -185,7 +185,7 @@ bb4:
 // CHECK:   apply {{%.*}}<Array<String>>([[CAST_TMP]], [[INPUT_VALUE]],
 // CHECK:   strong_release [[INPUT_VALUE]]
 // NOTE: When we perform take_always, this is the take of the cast.
-// CHECK:   strong_release [[INPUT_VALUE]]
+// CHECK:   release_value [[INPUT_VALUE]]
 // CHECK:   switch_enum_addr [[CAST_TMP]] : $*Optional<Array<String>>, case #Optional.none!enumelt: [[FAIL_BB]], default [[SUCCESS_TRAMPOLINE_BB:bb[0-9]+]]
 //
 // CHECK: [[SUCCESS_TRAMPOLINE_BB]]: