Merge branch 'master' into outline_copyddr

Author: Joe Shajrawi

CHANGELOG.md

@@ -22,6 +22,54 @@ CHANGELOG
 Swift 4.1
 ---------
 
+* [SE-0157][] is implemented. Associated types can now declare "recursive"
+	constraints, which require that the associated type conform to the enclosing
+	protocol. The standard library protocols have been updated to make use of
+	recursive constraints. For example, the `SubSequence` associated type of
+	follows the enclosing protocol:
+
+        protocol Sequence {
+          associatedtype Element
+          associatedtype SubSequence: Sequence
+            where SubSequence.Element == Element,
+                  SubSequence.SubSequence == SubSequence
+          // ...
+        }
+
+        protocol Collection: Sequence where Self.SubSequence: Collection {
+          // ...
+        }
+
+  As a result, a number of new constraints have been introduced into the
+	standard library protocols:
+
+	* Make the `Indices` associated type have the same traversal requirements as
+	its enclosing protocol, e.g., `Collection.Indices` conforms to
+	`Collection`, `BidirectionalCollection.Indices` conforms to
+	`BidirectionalCollection`, and so on
+	* Make `Numeric.Magnitude` conform to `Numeric`
+	* Use more efficient `SubSequence` types for lazy filter and map
+	* Eliminate the `*Indexable` protocols
+
+
+* [SE-0161][] is fully implemented. KeyPaths now support subscript, optional
+  chaining, and optional force-unwrapping components.
+
+* [SE-0186][]
+
+  It is no longer valid to use the ownership keywords `weak` and `unowned` for property declarations in protocols. These keywords are meaningless and misleading when used in a protocol as they don't have any effect.
+
+  In Swift 3 and 4 mode the following example will produce a warning with a fix-it to remove the keyword. In Swift 5 mode and above an error will be produced.
+
+  ```swift
+  class A {}
+
+  protocol P {
+      weak var weakVar: A? { get set }
+      unowned var unownedVar: A { get set }
+  }
+  ```
+
 * [SE-0185][]
 
   Structs and enums that declare a conformance to `Equatable`/`Hashable` now get an automatically synthesized implementation of `==`/`hashValue`. For structs, all stored properties must be `Equatable`/`Hashable`. For enums, all enum cases with associated values must be `Equatable`/`Hashable`.
@@ -6754,3 +6802,4 @@ Swift 1.0
 [SE-0183]: <https://github.com/apple/swift-evolution/blob/master/proposals/0183-substring-affordances.md>
 [SE-0184]: <https://github.com/apple/swift-evolution/blob/master/proposals/0184-unsafe-pointers-add-missing.md>
 [SE-0185]: <https://github.com/apple/swift-evolution/blob/master/proposals/0185-synthesize-equatable-hashable.md>
+[SE-0186]: <https://github.com/apple/swift-evolution/blob/master/proposals/0186-remove-ownership-keyword-support-in-protocols.md>

benchmark/utils/DriverUtils.swift

@@ -312,9 +312,9 @@ func internalMedian(_ inputs: [UInt64]) -> UInt64 {
 
 #if SWIFT_RUNTIME_ENABLE_LEAK_CHECKER
 
-@_silgen_name("swift_leaks_startTrackingObjects")
+@_silgen_name("_swift_leaks_startTrackingObjects")
 func startTrackingObjects(_: UnsafeMutableRawPointer) -> ()
-@_silgen_name("swift_leaks_stopTrackingObjects")
+@_silgen_name("_swift_leaks_stopTrackingObjects")
 func stopTrackingObjects(_: UnsafeMutableRawPointer) -> Int
 
 #endif

cmake/modules/AddSwift.cmake

@@ -1531,6 +1531,11 @@ function(add_swift_library name)
             if("${sdk}" STREQUAL "ANDROID")
               list(APPEND swiftlib_private_link_libraries_targets
                    "-latomic")
+            # the same issue on FreeBSD, missing symbols:
+            # __atomic_store, __atomic_compare_exchange, __atomic_load
+            elseif("${sdk}" STREQUAL "FREEBSD")
+              list(APPEND swiftlib_private_link_libraries_targets
+                   "${SWIFTLIB_DIR}/clang/lib/freebsd/libclang_rt.builtins-${arch}.a")
             endif()
           elseif("${lib}" STREQUAL "ICU_I18N")
             list(APPEND swiftlib_private_link_libraries_targets

docs/DebuggingTheCompiler.rst

@@ -13,6 +13,15 @@ Abstract
 This document contains some useful information for debugging the
 Swift compiler and Swift compiler output.
 
+Basic Utilities
+---------------
+
+Often, the first step to debug a compiler problem is to re-run the compiler
+with a command line, which comes from a crash trace or a build log.
+
+The script ``split-cmdline`` in ``utils/dev-scripts`` splits a command line
+into multiple lines. This is helpful to understand and edit long command lines.
+
 Printing the Intermediate Representations
 -----------------------------------------
 

docs/SIL.rst

@@ -784,8 +784,11 @@ Basic Blocks
   sil-label ::= sil-identifier ('(' sil-argument (',' sil-argument)* ')')? ':'
   sil-argument ::= sil-value-name ':' sil-type
 
-  sil-instruction-def ::= (sil-value-name '=')? sil-instruction
-                          (',' sil-loc)? (',' sil-scope-ref)?
+  sil-instruction-result ::= sil-value-name
+  sil-instruction-result ::= '(' (sil-value-name (',' sil-value-name)*)? ')'
+  sil-instruction-source-info ::= (',' sil-scope-ref)? (',' sil-loc)?
+  sil-instruction-def ::=
+    (sil-instruction-result '=')? sil-instruction sil-instruction-source-info
 
 A function body consists of one or more basic blocks that correspond
 to the nodes of the function's control flow graph. Each basic block
@@ -3506,6 +3509,19 @@ tuple_element_addr
 Given the address of a tuple in memory, derives the
 address of an element within that value.
 
+destructure_tuple
+`````````````````
+
+::
+
+   sil-instruction ::= 'destructure_tuple' sil-operand
+
+   (%elt1, ..., %eltn) = destructure_tuple %0 : $(Elt1Ty, ..., EltNTy)
+   // %0 must be a tuple of type $(Elt1Ty, ..., EltNTy)
+   // %eltN must have the type $EltNTy
+
+Given a tuple value, split the value into its constituent elements.
+
 struct
 ``````
 ::
@@ -3547,6 +3563,19 @@ struct_element_addr
 Given the address of a struct value in memory, derives the address of a
 physical field within the value.
 
+destructure_struct
+``````````````````
+
+::
+
+   sil-instruction ::= 'destructure_struct' sil-operand
+
+   (%elt1, ..., %eltn) = destructure_struct %0 : $S
+   // %0 must be a struct of type $S
+   // %eltN must have the same type as the Nth field of $S
+
+Given a struct, split the struct into its constituant fields.
+
 object
 ``````
 ::

include/swift/AST/DiagnosticsDriver.def

@@ -136,6 +136,11 @@ WARNING(verify_debug_info_requires_debug_option,none,
 ERROR(error_profile_missing,none,
       "no profdata file exists at '%0'", (StringRef))
 
+WARNING(warn_opt_remark_disabled, none,
+        "Emission of optimization records has been disabled, because it "
+        "requires a single compiler invocation: consider enabling the "
+        "-whole-module-optimization flag", ())
+
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

include/swift/AST/DiagnosticsParse.def

@@ -833,7 +833,7 @@ ERROR(expected_parameter_type,PointsToFirstBadToken,
 ERROR(expected_parameter_name,PointsToFirstBadToken,
       "expected parameter name followed by ':'", ())
 ERROR(expected_parameter_colon,PointsToFirstBadToken,
-      "expected ':' following argumant label and parameter name", ())
+      "expected ':' following argument label and parameter name", ())
 ERROR(missing_parameter_type,PointsToFirstBadToken,
       "parameter requires an explicit type", ())
 ERROR(multiple_parameter_ellipsis,none,

include/swift/AST/DiagnosticsSema.def

@@ -1635,17 +1635,18 @@ NOTE(redundant_conformance_witness_ignored,none,
      (DescriptiveDeclKind, DeclName, DeclName))
 
 // "Near matches"
-WARNING(optional_req_near_match,none,
-        "%0 %1 nearly matches optional requirement %2 of protocol %3",
-        (DescriptiveDeclKind, DeclName, DeclName, DeclName))
+WARNING(req_near_match,none,
+        "%0 %1 nearly matches %select{defaulted|optional}2 requirement %3 "
+        "of protocol %4",
+        (DescriptiveDeclKind, DeclName, bool, DeclName, DeclName))
 NOTE(optional_req_nonobjc_near_match_add_objc,none,
      "add '@objc' to provide an Objective-C entrypoint", ())
-NOTE(optional_req_near_match_move,none,
+NOTE(req_near_match_move,none,
      "move %0 to %select{an|another}1 extension to silence this warning",
      (DeclName, unsigned))
-NOTE(optional_req_near_match_nonobjc,none,
+NOTE(req_near_match_nonobjc,none,
      "add '@nonobjc' to silence this %select{warning|error}0", (bool))
-NOTE(optional_req_near_match_access,none,
+NOTE(req_near_match_access,none,
      "make %0 %select{ERROR|private|private|non-public|non-public}1 to silence this "
      "warning", (DeclName, AccessLevel))
 
@@ -1924,10 +1925,6 @@ NOTE(override_unnecessary_IUO_use_strict,none,
 NOTE(override_unnecessary_IUO_silence,none,
      "add parentheses to silence this warning", ())
 
-ERROR(iuo_in_illegal_position,none,
-      "implicitly unwrapped optionals are only allowed at top level and as "
-      "function results", ())
-
 ERROR(override_mutable_covariant_property,none,
       "cannot override mutable property %0 of type %1 with covariant type %2",
       (Identifier, Type, Type))
@@ -3111,6 +3108,22 @@ ERROR(tuple_single_element,none,
 ERROR(tuple_ellipsis,none,
       "cannot create a variadic tuple", ())
 
+WARNING(implicitly_unwrapped_optional_spelling_deprecated,none,
+        "the spelling 'ImplicitlyUnwrappedOptional' is deprecated", ())
+
+WARNING(implicitly_unwrapped_optional_spelling_deprecated_with_fixit,none,
+        "the spelling 'ImplicitlyUnwrappedOptional' is deprecated; use '!' after the type name", ())
+
+ERROR(implicitly_unwrapped_optional_spelling_error,none,
+        "the spelling 'ImplicitlyUnwrappedOptional' in unsupported; use an explicit type followed by '!'", ())
+
+ERROR(implicitly_unwrapped_optional_spelling_error_with_fixit,none,
+        "the spelling 'ImplicitlyUnwrappedOptional' is unsupported; use '!' after the type name", ())
+
+ERROR(iuo_in_illegal_position,none,
+      "implicitly unwrapped optionals are only allowed at top level and as "
+      "function results", ())
+
 // Ownership
 ERROR(invalid_ownership_type,none,
       "'%select{strong|weak|unowned|unowned}0' may only be applied to "