---

yaml
---
r: 326332
b: refs/heads/master-next
c: f1cb0d1
h: refs/heads/master

Author: jckarter

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: e052da7d8886fa0439677852e8f7830b20c2e1da
-refs/heads/master-next: 7ff0007702f501dbbe238a894695bbd7c964fc61
+refs/heads/master-next: f1cb0d11eff1adc42b2d0e6cfad9d2e39e74d7b3
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/CHANGELOG.md

@@ -26,63 +26,6 @@ CHANGELOG
 Swift Next
 ----------
 
-* [SR-11298][]:
-
-  A class-constrained protocol extension, where the extended protocol does
-  not impose a class constraint, will now infer the constraint implicitly.
-
-  ```swift
-  protocol Foo {}
-  class Bar: Foo {
-    var someProperty: Int = 0
-  }
-
-  // Even though 'Foo' does not impose a class constraint, it is automatically
-  // inferred due to the Self: Bar constraint.
-  extension Foo where Self: Bar {
-    var anotherProperty: Int {
-      get { return someProperty }
-      // As a result, the setter is now implicitly nonmutating, just like it would
-      // be if 'Foo' had a class constraint.
-      set { someProperty = newValue }
-    }
-  }
-  ```
-  
-  As a result, this could lead to code that currently compiles today to throw an error.
-  
-  ```swift
-  protocol Foo {
-    var someProperty: Int { get set }
-  }
-  
-  class Bar: Foo {
-    var someProperty = 0
-  }
-  
-  extension Foo where Self: Bar {
-    var anotherProperty1: Int {
-      get { return someProperty }
-      // This will now error, because the protocol requirement
-      // is implicitly mutating and the setter is implicitly 
-      // nonmutating.
-      set { someProperty = newValue } // Error
-    }
-  }
-  ```
-
-  **Workaround**: Define a new mutable variable inside the setter that has a reference to `self`:
-  
-  ```swift
-  var anotherProperty1: Int {
-    get { return someProperty }
-    set {
-      var mutableSelf = self
-      mutableSelf.someProperty = newValue // Okay
-    }
-  }
-```
-
 * [SE-0253][]:
 
   Values of types that declare `func callAsFunction` methods can be called
@@ -108,7 +51,7 @@ Swift Next
 
 * [SR-4206][]:
 
-  A method override is no longer allowed to have a generic signature with
+  A method override is no longer allowed to have a generic signature with 
   requirements not imposed by the base method. For example:
 
   ```
@@ -7822,4 +7765,3 @@ Swift 1.0
 [SR-8974]: <https://bugs.swift.org/browse/SR-8974>
 [SR-9043]: <https://bugs.swift.org/browse/SR-9043>
 [SR-9827]: <https://bugs.swift.org/browse/SR-9827>
-[SR-11298]: <https://bugs.swift.org/browse/SR-11298>

branches/master-next/README.md

@@ -18,16 +18,12 @@
 |**[Ubuntu 16.04 ](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/aarch64_ubuntu_16.04.json)** | AArch64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-aarch64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-aarch64)|
 |**[Android](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_LTS_android.json)** | ARMv7 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android)|
 |**[Android](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_LTS_android.json)** | AArch64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android-arm64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android-arm64)|
+|**[Ubuntu 16.04 (TensorFlow)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_tensorflow.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow)|
+|**[macOS 10.13 (TensorFlow)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_macos_high_sierra_tensorflow.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-macOS-tensorflow/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-macOS-tensorflow)|
+|**[Ubuntu 16.04 (TensorFlow with GPU)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_tensorflow_gpu.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow-gpu/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow-gpu)|
 |**[Debian 9.5](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_debian_9.5.json)** | x86_64 | [![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_5/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_5)|
 |**[Windows 2019](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_windows_2019.json)** | x86_64 | [![Build Status](https://ci-external.swift.org/job/oss-swift-windows-x86_64/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-windows-x86_64)|
 
-**Swift TensorFlow Community-Hosted CI Platforms**
-
-| **OS** | **Architecture** | **Build** |
-|---|:---:|:---:|
-|**[Ubuntu 16.04](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_tensorflow.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow)|
-|**[macOS 10.13](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_macos_high_sierra_tensorflow.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-macOS-tensorflow/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-macOS-tensorflow)|
-|**[Ubuntu 16.04 (GPU)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04_tensorflow_gpu.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow-gpu/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-tensorflow-gpu)|
 
 ## Welcome to Swift
 

branches/master-next/cmake/modules/SwiftHandleGybSources.cmake

@@ -121,9 +121,7 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/DeclNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/ExprNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/GenericNodes.py"
-      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/NodeSerializationCodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/PatternNodes.py"
-      "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/SILOnlyNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/StmtNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/TypeNodes.py"
       "${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/Token.py"

branches/master-next/cmake/modules/SwiftXcodeSupport.cmake

@@ -100,8 +100,8 @@ macro(swift_common_xcode_cxx_config)
   # Force usage of Clang.
   set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0"
       CACHE STRING "Xcode Compiler")
-  # Use C++'14.
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++14"
+  # Use C++'11.
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11"
       CACHE STRING "Xcode C++ Language Standard")
   # Use libc++.
   set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++"

branches/master-next/docs/CToSwiftNameTranslation.md

@@ -1,6 +1,6 @@
 # Name Translation from C to Swift
 
-This document gives a high-level description of how C and Objective-C declarations are translated to Swift, with particular focus on how names are adjusted. It is not attempting to be a *complete* description of everything the compiler does except with regards to how *names* are transformed; even there, some special cases that only apply to Apple's SDKs have been omitted. The example code shown is for illustrative purposes and does not always include all parts of an imported API's interface.
+This document gives a high-level description of how C and Objective-C declarations are translated to Swift, with particular focus on how names are adjusted. It is not attempting to be a *complete* description of everything the compiler does except with regards to how *names* are transformed; even there, some special cases that only apply to Apple's SDKs have been omitted.
 
 ## Word boundaries
 
@@ -239,208 +239,4 @@ _The original intent of the `swift_private` attribute was additionally to limit
 _For "historical reasons", the `swift_private` attribute is ignored on factory methods with no arguments imported as initializers. This is essentially matching the behavior of older Swift compilers for source compatibility in case someone has marked such a factory method as `swift_private`._
 
 
-## Custom names
-
-The `swift_name` Clang attribute can be used to control how a declaration imports into Swift. If it's valid, the value of the `swift_name` attribute always overrides any other name transformation rules (prefix-stripping, underscore-prepending, etc.)
-
-### Types and globals
-
-The `swift_name` attribute can be used to give a type or a global a custom name. In the simplest form, the value of the attribute must be a valid Swift identifier.
-
-```objc
-__attribute__((swift_name("SpacecraftCoordinates")))
-struct SPKSpacecraftCoordinates {
-  double x, y, z, t; // space and time, of course
-};
-```
-
-```swift
-struct SpacecraftCoordinates {
-  var x, y, z, t: Double
-}
-```
-
-### Import-as-member
-
-A custom name that starts with an identifier followed by a period is taken to be a member name. The identifier should be the imported Swift name of a C/Objective-C type in the same module. In this case, the type or global will be imported as a static member of the named type.
-
-```objc
-__attribute__((swift_name("SpacecraftCoordinates.earth")))
-extern const struct SPKSpacecraftCoordinates SPKSpacecraftCoordinatesEarth;
-```
-
-```swift
-extension SpacecraftCoordinates {
-  static var earth: SpacecraftCoordinates { get }
-}
-```
-
-Note that types cannot be imported as members of protocols.
-
-_The "in the same module" restriction is considered a technical limitation; a forward declaration of the base type will work around it._
-
-
-### C functions with custom names
-
-The `swift_name` attribute can be used to give a C function a custom name. The value of the attribute must be a full Swift function name, including parameter labels.
-
-```objc
-__attribute__((swift_name("doSomething(to:bar:)")))
-void doSomethingToFoo(Foo *foo, int bar);
-
-// Usually seen as NS_SWIFT_NAME.
-```
-
-```swift
-func doSomething(foo: UnsafeMutablePointer<Foo>, bar: Int32)
-```
-
-An underscore can be used in place of an empty parameter label, as in Swift.
-
-A C function with zero arguments and a non-`void` return type can also be imported as a computed variable by using the `getter:` prefix on the name. A function with one argument and a `void` return type can optionally serve as the setter for that variable using `setter:`.
-
-```objc
-__attribute__((swift_name("getter:globalCounter()")))
-int getGlobalCounter(void);
-__attribute__((swift_name("setter:globalCounter(_:)")))
-void setGlobalCounter(int newValue);
-```
-
-```swift
-var globalCounter: Int32 { get set }
-```
-
-Note that the argument lists must still be present even though the name used is the name of the variable. (Also note the `void` parameter list to specify a C function with zero arguments. This is required!)
-
-Variables with setters and no getters are not supported.
-
-
-#### Import-as-member
-
-Like types and globals, functions can be imported as static members of types.
-
-```objc
-__attribute__((swift_name("NSSound.beep()")))
-void NSBeep(void);
-```
-
-```swift
-extension NSSound {
-  static func beep()
-}
-```
-
-However, by giving a parameter the label `self`, a function can also be imported as an instance member of a type __T__. In this case, the parameter labeled `self` must either have the type __T__ itself, or be a pointer to __T__. The latter is only valid if __T__ is imported as a value type; if the pointer is non-`const`, the resulting method will be `mutating`. If __T__ is a class, the function will be `final`.
-
-```objc
-typedef struct {
-  int value;
-} Counter;
-
-__attribute__((swift_name("Counter.printValue(self:)")))
-void CounterPrintValue(Counter c);
-__attribute__((swift_name("Counter.printValue2(self:)")))
-void CounterPrintValue2(const Counter *c);
-__attribute__((swift_name("Counter.resetValue(self:)")))
-void CounterResetValue(Counter *c);
-```
-
-```swift
-struct Counter {
-  var value: Int32 { get set }
-}
-
-extension Counter {
-  func printValue()
-  func printValue2()
-  mutating func resetValue()
-}
-```
-
-This also applies to getters and setters, to be imported as instance properties.
-
-```objc
-__attribute__((swift_name("getter:Counter.absoluteValue(self:)")))
-int CounterGetAbsoluteValue(Counter c);
-```
-
-```swift
-extension Counter {
-  var absoluteValue: Int32 { get }
-}
-```
-
-The getter/setter syntax also allows for subscripts by using the base name `subscript`.
-
-```objc
-__attribute__((swift_name("getter:LinkedListOfInts.subscript(self:_:)")))
-int LinkedListGetAtIndex(const LinkedListOfInts *head, int index);
-```
-
-```swift
-extension LinkedListOfInts {
-  subscript(_ index: Int32) -> Int32 { get }
-}
-```
-
-Finally, functions can be imported as initializers as well by using the base name `init`. These are considered "factory" initializers and are never inherited or overridable. They must not have a `self` parameter.
-
-```objc
-__attribute__((swift_name("Counter.init(initialValue:)")))
-Counter CounterCreateWithInitialValue(int value);
-```
-
-```swift
-extension Counter {
-  /* non-inherited */ init(initialValue value: Int32)
-}
-```
-
-
-### Enumerators (enum cases)
-
-The `swift_name` attribute can be used to rename enumerators. As mentioned above, not only does no further prefix-stripping occur on the resulting name, but the presence of a custom name removes the enum case from the computation of a prefix for the other cases.
-
-```
-// Actual example from Apple's SDKs; in fact, the first shipping example of
-// swift_name on an enumerator at all!
-typedef NS_ENUM(NSUInteger, NSXMLNodeKind) {
-  NSXMLInvalidKind = 0,
-  NSXMLDocumentKind,
-  NSXMLElementKind,
-  NSXMLAttributeKind,
-  NSXMLNamespaceKind,
-  NSXMLProcessingInstructionKind,
-  NSXMLCommentKind,
-  NSXMLTextKind,
-  NSXMLDTDKind NS_SWIFT_NAME(DTDKind),
-  NSXMLEntityDeclarationKind,
-  NSXMLAttributeDeclarationKind,
-  NSXMLElementDeclarationKind,
-  NSXMLNotationDeclarationKind
-};
-```
-
-```
-public enum Kind : UInt {
-  case invalid
-  case document
-  case element
-  case attribute
-  case namespace
-  case processingInstruction
-  case comment
-  case text
-  case DTDKind
-  case entityDeclaration
-  case attributeDeclaration
-  case elementDeclaration
-  case notationDeclaration
-}
-```
-
-Although enumerators always have global scope in C, they are often imported as members in Swift, and thus the `swift_name` attribute cannot be used to import them as members of another type unless the enum type is anonymous.
-
-_Currently, `swift_name` does not even allow importing an enum case as a member of the enum type itself, even if the enum is not recognized as an `@objc` enum, error code enum, or option set (i.e. the situation where a case is imported as a global constant)._
-
 ## More to come...

branches/master-next/docs/SIL.rst

@@ -17,10 +17,8 @@ the Swift programming language. SIL accommodates the following use cases:
   such as definitive initialization of variables and constructors, code
   reachability, switch coverage.
 - High-level optimization passes, including retain/release optimization,
-  dynamic method devirtualization, closure inlining, promoting heap allocations
-  to stack allocations, promoting stack allocations to SSA registers, scalar
-  replacement of aggregates (splitting aggregate allocations into multiple
-  smaller allocations), and generic function instantiation.
+  dynamic method devirtualization, closure inlining, memory allocation promotion,
+  and generic function instantiation.
 - A stable distribution format that can be used to distribute "fragile"
   inlineable or generic code with Swift library modules, to be optimized into
   client binaries.

branches/master-next/include/swift/AST/ASTContext.h

@@ -460,8 +460,6 @@ class ASTContext final {
   /// Retrieve the declaration of ObjectiveC.ObjCBool.
   StructDecl *getObjCBoolDecl() const;
 
-  /// Retrieve the declaration of Foundation.NSCopying.
-  ProtocolDecl *getNSCopyingDecl() const;
   /// Retrieve the declaration of Foundation.NSError.
   ClassDecl *getNSErrorDecl() const;
   /// Retrieve the declaration of Foundation.NSNumber.

branches/master-next/include/swift/AST/ASTNode.h

@@ -36,10 +36,10 @@ namespace swift {
   enum class DeclKind : uint8_t;
   enum class StmtKind;
 
-  struct ASTNode : public llvm::PointerUnion<Expr*, Stmt*, Decl*> {
+  struct ASTNode : public llvm::PointerUnion3<Expr*, Stmt*, Decl*> {
     // Inherit the constructors from PointerUnion.
-    using PointerUnion::PointerUnion;
-
+    using PointerUnion3::PointerUnion3;
+    
     SourceRange getSourceRange() const;
 
     /// Return the location of the start of the statement.