---

yaml
---
r: 345519
b: refs/heads/master
c: 9a2bf8d
h: refs/heads/master
i:
  345517: b8f6fb9
  345515: e85c26f
  345511: a4b743a
  345503: 49f3d78

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: fa37884515e0ac7b3d3f9634e6dec7b2acbbdbaf
+refs/heads/master: 9a2bf8d4f89a221ef8c30847e22983708a7d3cd0
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/FrontendTool/ReferenceDependencies.cpp

@@ -22,6 +22,7 @@
 #include "swift/AST/NameLookup.h"
 #include "swift/AST/ReferencedNameTracker.h"
 #include "swift/AST/Types.h"
+#include "swift/Basic/FileSystem.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/ReferenceDependencyKeys.h"
 #include "swift/Frontend/FrontendOptions.h"
@@ -65,11 +66,6 @@ class ReferenceDependenciesEmitter {
                    llvm::raw_ostream &out);
 
 private:
-  /// Opens file for reference dependencies. Emits diagnostic if needed.
-  ///
-  /// \return nullptr on error
-  static std::unique_ptr<llvm::raw_fd_ostream> openFile(DiagnosticEngine &diags,
-                                                        StringRef OutputPath);
   /// Emits all the dependency information.
   void emit() const;
 
@@ -189,35 +185,24 @@ static std::string escape(DeclBaseName name) {
   return llvm::yaml::escape(name.userFacingName());
 }
 
-std::unique_ptr<llvm::raw_fd_ostream>
-ReferenceDependenciesEmitter::openFile(DiagnosticEngine &diags,
-                                       StringRef outputPath) {
+bool ReferenceDependenciesEmitter::emit(DiagnosticEngine &diags,
+                                        SourceFile *const SF,
+                                        const DependencyTracker &depTracker,
+                                        StringRef outputPath) {
   // Before writing to the dependencies file path, preserve any previous file
   // that may have been there. No error handling -- this is just a nicety, it
   // doesn't matter if it fails.
   llvm::sys::fs::rename(outputPath, outputPath + "~");
-
-  std::error_code EC;
-  auto out = llvm::make_unique<llvm::raw_fd_ostream>(outputPath, EC,
-                                                     llvm::sys::fs::F_None);
-
-  if (out->has_error() || EC) {
+  std::error_code EC =
+      swift::atomicallyWritingToFile(outputPath,
+                                     [&](llvm::raw_pwrite_stream &out) {
+    ReferenceDependenciesEmitter::emit(SF, depTracker, out);
+  });
+  if (EC) {
     diags.diagnose(SourceLoc(), diag::error_opening_output, outputPath,
                    EC.message());
-    out->clear_error();
-    return nullptr;
-  }
-  return out;
-}
-
-bool ReferenceDependenciesEmitter::emit(DiagnosticEngine &diags,
-                                        SourceFile *const SF,
-                                        const DependencyTracker &depTracker,
-                                        StringRef outputPath) {
-  const std::unique_ptr<llvm::raw_ostream> out = openFile(diags, outputPath);
-  if (!out.get())
     return true;
-  ReferenceDependenciesEmitter::emit(SF, depTracker, *out);
+  }
   return false;
 }
 

trunk/stdlib/public/SDK/Foundation/Boxing.swift

@@ -62,9 +62,3 @@ extension _MutableBoxing {
         return whatToDo(_handle._pointer)
     }
 }
-
-internal enum _MutableUnmanagedWrapper<ImmutableType : NSObject, MutableType : NSObject>
-  where MutableType : NSMutableCopying{
-    case Immutable(Unmanaged<ImmutableType>)
-    case Mutable(Unmanaged<MutableType>)
-}

trunk/stdlib/public/SDK/Foundation/Decimal.swift

@@ -13,6 +13,8 @@
 @_exported import Foundation // Clang module
 import _SwiftCoreFoundationOverlayShims
 
+// The methods in this extension exist to match the protocol requirements of FloatinPoint, even if we can't conform directly.
+// If it becomes clear that conformance is truly impossible, we can deprecate some of the methods (e.g. isEqual(to:)) in favor of operators.
 extension Decimal {
     public typealias RoundingMode = NSDecimalNumber.RoundingMode
     public typealias CalculationError = NSDecimalNumber.CalculationError

trunk/stdlib/public/SDK/Foundation/NSCoder.swift

@@ -229,16 +229,3 @@ extension NSKeyedUnarchiver {
     }
   }
 }
-
-
-@available(*, deprecated, renamed:"NSCoding", message: "Please use NSCoding")
-typealias Coding = NSCoding
-
-@available(*, deprecated, renamed:"NSCoder", message: "Please use NSCoder")
-typealias Coder = NSCoder
-
-@available(*, deprecated, renamed:"NSKeyedUnarchiver", message: "Please use NSKeyedUnarchiver")
-typealias KeyedUnarchiver = NSKeyedUnarchiver
-
-@available(*, deprecated, renamed:"NSKeyedArchiver", message: "Please use NSKeyedArchiver")
-typealias KeyedArchiver = NSKeyedArchiver

trunk/stdlib/public/SDK/Foundation/NSDictionary.swift

@@ -34,7 +34,7 @@ extension Dictionary {
   ///
   /// The provided `NSDictionary` will be copied to ensure that the copy can
   /// not be mutated by other code.
-  public init(_cocoaDictionary: __shared _NSDictionary) {
+  fileprivate init(_cocoaDictionary: __shared _NSDictionary) {
     assert(
       _isBridgedVerbatimToObjectiveC(Key.self) &&
       _isBridgedVerbatimToObjectiveC(Value.self),

trunk/stdlib/public/SDK/Foundation/NSGeometry.swift

@@ -20,35 +20,15 @@ import CoreGraphics
 // NSRectEdge
 //===----------------------------------------------------------------------===//
 
-// In the SDK, the following NS*Edge constants are defined as macros for the
-// corresponding CGRectEdge enumerators.  Thus, in the SDK, NS*Edge constants
-// have CGRectEdge type.  This is not correct for Swift (as there is no
-// implicit conversion to NSRectEdge).
-
-@available(*, unavailable, renamed: "NSRectEdge.MinX")
-public var NSMinXEdge: NSRectEdge {
-  fatalError("unavailable property can't be accessed")
-}
-@available(*, unavailable, renamed: "NSRectEdge.MinY")
-public var NSMinYEdge: NSRectEdge {
-  fatalError("unavailable property can't be accessed")
-}
-@available(*, unavailable, renamed: "NSRectEdge.MaxX")
-public var NSMaxXEdge: NSRectEdge {
-  fatalError("unavailable property can't be accessed")
-}
-@available(*, unavailable, renamed: "NSRectEdge.MaxY")
-public var NSMaxYEdge: NSRectEdge {
-  fatalError("unavailable property can't be accessed")
-}
-
 extension NSRectEdge {
+  @inlinable
   public init(rectEdge: CGRectEdge) {
     self = NSRectEdge(rawValue: UInt(rectEdge.rawValue))!
   }
 }
 
 extension CGRectEdge {
+  @inlinable
   public init(rectEdge: NSRectEdge) {
     self = CGRectEdge(rawValue: UInt32(rectEdge.rawValue))!
   }

trunk/stdlib/public/SDK/Foundation/NSIndexSet.swift

@@ -12,7 +12,7 @@
 
 @_exported import Foundation // Clang module
 
-// FIXME: move inside NSIndexSet when the compiler supports this.
+// TODO: Evaluate deprecating with a message in favor of IndexSet.
 public struct NSIndexSetIterator : IteratorProtocol {
   public typealias Element = Int
 

trunk/stdlib/public/SDK/Foundation/NSObject.swift

@@ -13,7 +13,10 @@
 @_exported import Foundation // Clang module
 import ObjectiveC
 
+// This exists to allow for dynamic dispatch on KVO methods added to NSObject.
+// Extending NSObject with these methods would disallow overrides.
 public protocol _KeyValueCodingAndObserving {}
+extension NSObject : _KeyValueCodingAndObserving {}
 
 public struct NSKeyValueObservedChange<Value> {
     public typealias Kind = NSKeyValueChange
@@ -230,5 +233,3 @@ extension _KeyValueCodingAndObserving {
         (self as! NSObject).didChangeValue(forKey: _bridgeKeyPathToString(keyPath), withSetMutation: mutation, using: set)
     }
 }
-
-extension NSObject : _KeyValueCodingAndObserving {}

trunk/stdlib/public/SDK/Foundation/NSSet.swift

@@ -17,7 +17,7 @@ extension Set {
   ///
   /// The provided `NSSet` will be copied to ensure that the copy can
   /// not be mutated by other code.
-  public init(_cocoaSet: __shared _NSSet) {
+  fileprivate init(_cocoaSet: __shared _NSSet) {
     assert(_isBridgedVerbatimToObjectiveC(Element.self),
       "Set can be backed by NSSet _variantStorage only when the member type can be bridged verbatim to Objective-C")
     // FIXME: We would like to call CFSetCreateCopy() to avoid doing an