---

yaml
---
r: 285631
b: refs/heads/master
c: 6171d68
h: refs/heads/master
i:
  285629: 614fc8c
  285627: d4cf5e8
  285623: a3364b9
  285615: 0219f8e
  285599: b03f199
  285567: 9081c32

Author: Itai Ferber

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 55b300f852031bb8daea8ae85c3d18acf9d5d114
+refs/heads/master: 6171d68bfae60d98919f8a7680b83bbefab1e445
 refs/heads/master-next: 90f691eef4aee378af27084030679214a1a39d50
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/ABI/Metadata.h

@@ -3121,10 +3121,6 @@ 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,

trunk/lib/SILOptimizer/Utils/CastOptimizer.cpp

@@ -321,17 +321,45 @@ CastOptimizer::optimizeBridgedObjCToSwiftCast(SILDynamicCastInst dynamicCast) {
   auto *CCABI = cast<CheckedCastAddrBranchInst>(Inst);
   switch (CCABI->getConsumptionKind()) {
   case CastConsumptionKind::TakeAlways:
-    Builder.createReleaseValue(Loc, srcOp, Builder.getDefaultAtomicity());
+    Builder.emitDestroyValueOperation(Loc, srcOp);
     break;
   case CastConsumptionKind::TakeOnSuccess: {
-    // Insert a release in the success BB.
-    SILBuilderWithScope SuccessBuilder(SuccessBB->begin());
-    SuccessBuilder.emitDestroyValueOperation(Loc, srcOp);
+    {
+      // 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);
+      }
+    }
     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;
   }
 

trunk/lib/Sema/TypeCheckAttr.cpp

@@ -2735,6 +2735,10 @@ 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.

trunk/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)
     }
 }

trunk/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))
@@ -1580,7 +1580,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
                     precondition(range.lowerBound <= endIndex, "index \(range.lowerBound) is out of bounds of \(startIndex)..<\(endIndex)")
                     self = .large(LargeSlice(count: range.upperBound))
                 }
-                break
             case .inline(var inline):
                 if inline.count < range.upperBound {
                     if InlineSlice.canStore(count: range.upperBound) {
@@ -1596,7 +1595,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
                     inline.resetBytes(in: range)
                     self = .inline(inline)
                 }
-                break
             case .slice(var slice):
                 if InlineSlice.canStore(count: range.upperBound) {
                     self = .empty
@@ -1608,7 +1606,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
                     newSlice.resetBytes(in: range)
                     self = .large(newSlice)
                 }
-                break
             case .large(var slice):
                 self = .empty
                 slice.resetBytes(in: range)
@@ -1630,7 +1627,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
                 } else {
                     self = .large(LargeSlice(UnsafeRawBufferPointer(start: bytes, count: cnt)))
                 }
-                break
             case .inline(var inline):
                 let resultingCount = inline.count + cnt - (subrange.upperBound - subrange.lowerBound)
                 if resultingCount == 0 {
@@ -1647,7 +1643,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
                     slice.replaceSubrange(subrange, with: bytes, count: cnt)
                     self = .large(slice)
                 }
-                break
             case .slice(var slice):
                 let resultingUpper = slice.endIndex + cnt - (subrange.upperBound - subrange.lowerBound)
                 if slice.startIndex == 0 && resultingUpper == 0 {
@@ -1820,7 +1815,6 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
                 return
             case .inline(let inline):
                 inline.copyBytes(to: pointer, from: range)
-                break
             case .slice(let slice):
                 slice.copyBytes(to: pointer, from: range)
             case .large(let slice):
@@ -2319,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)
         }