---

yaml
---
r: 210431
b: refs/heads/swift-5.0-branch
c: 8fab22f
h: refs/heads/master
i:
  210429: 6ea7da0
  210427: f6a71bd
  210423: b5f27ce
  210415: 79320d1
  210399: 1b18a58
  210367: 4eaf695
  210303: ef1c082
  210175: 49eb11d
  209919: dbea221

Author: Nathan Hawes

[refs]

@@ -644,7 +644,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2017-12-23-a: b7c074342459a645779f106c42bf4
 refs/heads/master-llvm-swift5-transition: 8ace18c8953afb3d7d94cf04cacc0b51a7e5f1e3
 "refs/heads/revert-12883-disable_modelio_test_ios": a77ae373b809a0d8cb460cf3d1585d618510d242
 refs/heads/revert-13597-master: cccee1df039d072215f9bddc2cbc1e32a8d5d5ee
-refs/heads/swift-5.0-branch: 1b90ef7b6b59c8c1cf7405b324545a4c82c958e8
+refs/heads/swift-5.0-branch: 8fab22f124de71583e39cc7fa5cc6219bb66cf82
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-23-a: b32214f7e04339dfada623b6b76dbebfb41e4541
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-24-a: 1eb0be506c0744c7eff0550a10240286046e181d
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2017-12-25-a: f35a91502bad0065c83d8760407c23be7b899f48

branches/swift-5.0-branch/cmake/modules/AddSwift.cmake

@@ -123,11 +123,10 @@ function(_add_variant_c_compile_link_flags)
     list(APPEND result "-target" "${SWIFT_SDK_${CFLAGS_SDK}_ARCH_${CFLAGS_ARCH}_TRIPLE}${DEPLOYMENT_VERSION}")
   endif()
 
-  set(_sysroot "${SWIFT_SDK_${CFLAGS_SDK}_ARCH_${CFLAGS_ARCH}_PATH}")
   if(IS_DARWIN)
-    list(APPEND result "-isysroot" "${_sysroot}")
-  elseif(NOT SWIFT_COMPILER_IS_MSVC_LIKE AND NOT "${_sysroot}" STREQUAL "/")
-    list(APPEND result "--sysroot=${_sysroot}")
+    list(APPEND result "-isysroot" "${SWIFT_SDK_${CFLAGS_SDK}_PATH}")
+  elseif(NOT SWIFT_COMPILER_IS_MSVC_LIKE AND NOT "${SWIFT_SDK_${CFLAGS_SDK}_PATH}" STREQUAL "/")
+    list(APPEND result "--sysroot=${SWIFT_SDK_${CFLAGS_SDK}_PATH}")
   endif()
 
   if("${CFLAGS_SDK}" STREQUAL "ANDROID")
@@ -295,9 +294,9 @@ function(_add_variant_swift_compile_flags
     sdk arch build_type enable_assertions result_var_name)
   set(result ${${result_var_name}})
 
-  # On Windows, we don't set SWIFT_SDK_WINDOWS_PATH_ARCH_{ARCH}_PATH, so don't include it.
+  # On Windows, we don't set SWIFT_SDK_WINDOWS_PATH, so don't include it.
   if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
-    list(APPEND result "-sdk" "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}")
+    list(APPEND result "-sdk" "${SWIFT_SDK_${sdk}_PATH}")
   endif()
 
   is_darwin_based_sdk("${sdk}" IS_DARWIN)
@@ -315,7 +314,7 @@ function(_add_variant_swift_compile_flags
 
   if(IS_DARWIN)
     list(APPEND result
-      "-F" "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}/../../../Developer/Library/Frameworks")
+        "-F" "${SWIFT_SDK_${sdk}_PATH}/../../../Developer/Library/Frameworks")
   endif()
 
   is_build_type_optimized("${build_type}" optimized)
@@ -1620,7 +1619,7 @@ function(add_swift_library name)
         # Add PrivateFrameworks, rdar://28466433
         set(swiftlib_link_flags_all ${SWIFTLIB_LINK_FLAGS})
         if(SWIFTLIB_IS_SDK_OVERLAY)
-          list(APPEND swiftlib_swift_compile_flags_all "-Fsystem" "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}/System/Library/PrivateFrameworks/")
+          list(APPEND swiftlib_swift_compile_flags_all "-Fsystem" "${SWIFT_SDK_${sdk}_PATH}/System/Library/PrivateFrameworks/")
         endif()
 
        if("${sdk}" STREQUAL "IOS_SIMULATOR")

branches/swift-5.0-branch/cmake/modules/SwiftConfigureSDK.cmake

@@ -22,6 +22,7 @@ function(_report_sdk prefix)
       message(STATUS "  ${arch} LIB: ${${arch}_LIB}")
     endforeach()
   else()
+    message(STATUS "  Path: ${SWIFT_SDK_${prefix}_PATH}")
     foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})
       message(STATUS "  ${arch} Path: ${SWIFT_SDK_${prefix}_ARCH_${arch}_PATH}")
     endforeach()
@@ -144,6 +145,7 @@ macro(configure_sdk_unix
 
   # Todo: this only supports building an SDK for one target arch only.
   set(SWIFT_SDK_${prefix}_NAME "${name}")
+  set(SWIFT_SDK_${prefix}_PATH "${sdkpath}")
   set(SWIFT_SDK_${prefix}_ARCH_${arch}_PATH "${sdkpath}")
   set(SWIFT_SDK_${prefix}_VERSION "don't use")
   set(SWIFT_SDK_${prefix}_BUILD_NUMBER "don't use")
@@ -171,6 +173,10 @@ macro(configure_sdk_windows prefix sdk_name environment architectures)
   # variables.
 
   set(SWIFT_SDK_${prefix}_NAME "${sdk_name}")
+  # NOTE: set the path to / to avoid a spurious `--sysroot` from being passed
+  # to the driver -- rely on the `INCLUDE` AND `LIB` environment variables
+  # instead.
+  set(SWIFT_SDK_${prefix}_PATH "/")
   set(SWIFT_SDK_${prefix}_VERSION "NOTFOUND")
   set(SWIFT_SDK_${prefix}_BUILD_NUMBER "NOTFOUND")
   set(SWIFT_SDK_${prefix}_DEPLOYMENT_VERSION "")
@@ -188,9 +194,6 @@ macro(configure_sdk_windows prefix sdk_name environment architectures)
       set(SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE
           "${arch}-unknown-windows-${environment}")
     endif()
-    # NOTE: set the path to / to avoid a spurious `--sysroot` from being passed
-    # to the driver -- rely on the `INCLUDE` AND `LIB` environment variables
-    # instead.
     set(SWIFT_SDK_${prefix}_ARCH_${arch}_PATH "/")
   endforeach()
 

branches/swift-5.0-branch/docs/ABI/Mangling.rst

@@ -63,11 +63,9 @@ Globals
   global ::= context 'MXX'               // anonymous context descriptor
   global ::= context identifier 'MXY'    // anonymous context descriptor
   global ::= type assoc_type_path 'MXA'  // generic parameter ref
-  global ::= protocol 'Mp'               // protocol descriptor
-  global ::= protocol 'WR'               // protocol requirement table
-
   global ::= nominal-type 'Mo'           // class metadata immediate member base offset
-
+  global ::= protocol 'Mp'               // protocol descriptor
+  global ::= protocol-conformance 'Mc'   // protocol conformance descriptor
   global ::= type 'MF'                   // metadata for remote mirrors: field descriptor
   global ::= type 'MB'                   // metadata for remote mirrors: builtin type descriptor
   global ::= protocol-conformance 'MA'   // metadata for remote mirrors: associated type descriptor
@@ -78,27 +76,35 @@ Globals
   global ::= mangled-name 'Ta'                     // ObjC partial application forwarder
 
   global ::= type 'w' VALUE-WITNESS-KIND // value witness
-
-  global ::= protocol-conformance 'Mc'   // protocol conformance descriptor
-  global ::= protocol-conformance 'WP'   // protocol witness table
   global ::= protocol-conformance 'Wa'   // protocol witness table accessor
-
   global ::= protocol-conformance 'WG'   // generic protocol witness table
-  global ::= protocol-conformance 'Wp'   // protocol witness table pattern
-  global ::= protocol-conformance 'Wr'   // resilient witness table
   global ::= protocol-conformance 'WI'   // generic protocol witness table instantiation function
   global ::= type protocol-conformance 'WL'   // lazy protocol witness table cache variable
+  global ::= entity 'Wo'                 // witness table offset
+  global ::= protocol-conformance 'WP'   // protocol witness table
 
   global ::= protocol-conformance identifier 'Wt' // associated type metadata accessor
   global ::= protocol-conformance assoc_type_path nominal-type 'WT' // associated type witness table accessor
   global ::= type protocol-conformance 'Wl' // lazy protocol witness table accessor
-
   global ::= type 'WV'                   // value witness table
-  global ::= entity 'Wvd'                // field offset
-  global ::= entity 'WC'                 // resilient enum tag index
+  global ::= entity 'Wv' DIRECTNESS      // field offset
+  global ::= entity 'WC' // resilient enum tag index
+
+  global ::= type 'Wy' // Outlined Copy Function Type
+  global ::= type 'We' // Outlined Consume Function Type
+  global ::= type 'Wr' // Outlined Retain Function Type
+  global ::= type 'Ws' // Outlined Release Function Type
+  global ::= type 'Wb' INDEX // Outlined InitializeWithTake Function Type
+  global ::= type 'Wc' INDEX // Outlined InitializeWithCopy Function Type
+  global ::= type 'Wd' INDEX // Outlined AssignWithTake Function Type
+  global ::= type 'Wf' INDEX // Outlined AssignWithCopy Function Type
+  global ::= type 'Wh' INDEX // Outlined Destroy Function Type
 
   assoc_type_path ::= identifier '_' identifier*
 
+  DIRECTNESS ::= 'd'                         // direct
+  DIRECTNESS ::= 'i'                         // indirect
+
 A direct symbol resolves directly to the address of an object.  An
 indirect symbol resolves to the address of a pointer to the object.
 They are distinct manglings to make a certain class of bugs
@@ -169,18 +175,6 @@ The types in a reabstraction thunk helper function are always non-polymorphic
 ``<VALUE-WITNESS-KIND>`` differentiates the kinds of value
 witness functions for a type.
 
-::
-
-  global ::= generic-signature? type 'WOy' // Outlined copy
-  global ::= generic-signature? type 'WOe' // Outlined consume
-  global ::= generic-signature? type 'WOr' // Outlined retain
-  global ::= generic-signature? type 'WOs' // Outlined release
-  global ::= generic-signature? type 'WOb' // Outlined initializeWithTake
-  global ::= generic-signature? type 'WOc' // Outlined initializeWithCopy
-  global ::= generic-signature? type 'WOd' // Outlined assignWithTake
-  global ::= generic-signature? type 'WOf' // Outlined assignWithCopy
-  global ::= generic-signature? type 'WOh' // Outlined destroy
-
 Entities
 ~~~~~~~~
 

branches/swift-5.0-branch/docs/DebuggingTheCompiler.rst

@@ -377,46 +377,6 @@ Then by running ``lldb test -s test.lldb``, lldb will:
 Using LLDB scripts can enable one to use complex debugger workflows without
 needing to retype the various commands perfectly every time.
 
-Custom LLDB Commands
-~~~~~~~~~~~~~~~~~~~~
-
-If you've ever found yourself repeatedly entering a complex sequence of
-commands within a debug session, consider using custom lldb commands. Custom
-commands are a handy way to automate debugging tasks.
-
-For example, say we need a command that prints the contents of the register
-``rax`` and then steps to the next instruction. Here's how to define that
-command within a debug session::
-
-    (lldb) script
-    Python Interactive Interpreter. To exit, type 'quit()', 'exit()' or Ctrl-D.
-    >>> def custom_step():
-    ...   print "rax =", lldb.frame.FindRegister("rax")
-    ...   lldb.thread.StepInstruction(True)
-    ...
-    >>> ^D
-
-You can call this function using the ``script`` command, or via an alias::
-
-    (lldb) script custom_step()
-    rax = ...
-    <debugger steps to the next instruction>
-
-    (lldb) command alias cs script custom_step()
-    (lldb) cs
-    rax = ...
-    <debugger steps to the next instruction>
-
-Printing registers and single-stepping are by no means the only things you can
-do with custom commands. The LLDB Python API surfaces a lot of useful
-functionality, such as arbitrary expression evaluation.
-
-There are some pre-defined custom commands which can be especially useful while
-debugging the swift compiler. These commands live in
-``swift/utils/lldb/lldbToolBox.py``. There is a wrapper script available in
-``SWIFT_BINARY_DIR/bin/lldb-with-tools`` which launches lldb with those
-commands loaded.
-
 Reducing SIL test cases using bug_reducer
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

branches/swift-5.0-branch/include/swift/ABI/MetadataValues.h

@@ -1385,74 +1385,28 @@ class GenericMetadataPatternFlags : public FlagSet<uint32_t> {
 
 /// The public state of a metadata.
 enum class MetadataState : size_t {
-  // The values of this enum are set up to give us some future flexibility
-  // in adding states.  The compiler emits unsigned comparisons against
-  // these values, so adding states that aren't totally ordered with at
-  // least the existing values will pose a problem; but we also use a
-  // gradually-shrinking bitset in case it's useful to track states as
-  // separate capabilities.  Specific values have been chosen so that a
-  // MetadataRequest of 0 represents a blocking complete request, which
-  // is the most likely request from ordinary code.  The total size of a
-  // state is kept to 8 bits so that a full request, even with additional
-  // flags, can be materialized as a single immediate on common ISAs, and
-  // so that the state can be extracted with a byte truncation.
-  // The spacing between states reflects guesswork about where new
-  // states/capabilities are most likely to be added.
-
-  /// The metadata is fully complete.  By definition, this is the
-  /// end-state of all metadata.  Generally, metadata is expected to be
-  /// complete before it can be passed to arbitrary code, e.g. as
-  /// a generic argument to a function or as a metatype value.
+  /// A request for fully-completed metadata.  The metadata must be
+  /// prepared for all supported type operations.  This is a superset
+  /// of the requirements of LayoutComplete.
   ///
-  /// In addition to the requirements of NonTransitiveComplete, certain
-  /// transitive completeness guarantees must hold.  Most importantly,
-  /// complete nominal type metadata transitively guarantee the completion
-  /// of their stored generic type arguments and superclass metadata.
-  Complete = 0x00,
-
-  /// The metadata is fully complete except for any transitive completeness
-  /// guarantees.
-  ///
-  /// In addition to the requirements of LayoutComplete, metadata in this
-  /// state must be prepared for all basic type operations.  This includes:
-  ///
-  ///   - any sort of internal layout necessary to allocate and work
-  ///     with concrete values of the type, such as the instance layout
-  ///     of a class;
-  ///
-  ///   - any sort of external dynamic registration that might be required
-  ///     for the type, such as the realization of a class by the Objective-C
-  ///     runtime; and
-  ///
-  ///   - the initialization of any other information kept in the metadata
-  ///     object, such as a class's v-table.
-  NonTransitiveComplete = 0x01,
-
-  /// The metadata is ready for the layout of other types that store values
-  /// of this type.
-  ///
-  /// In addition to the requirements of Abstract, metadata in this state
-  /// must have a valid value witness table, meaning that its size,
-  /// alignment, and basic type properties (such as POD-ness) have been
-  /// computed.
-  LayoutComplete = 0x3F,
-
-  /// The metadata has its basic identity established.  It is possible to
-  /// determine what formal type it corresponds to.  Among other things, it
-  /// is possible to use the runtime mangling facilities with the type.
-  ///
-  /// For example, a metadata for a generic struct has a metadata kind,
-  /// a type descriptor, and all of its type arguments.  However, it does not
-  /// necessarily have a meaningful value-witness table.
-  ///
-  /// References to other types that are not part of the type's basic identity
-  /// may not yet have been established.  Most crucially, this includes the
-  /// superclass pointer.
-  Abstract = 0xFF,
+  /// For example, a class must be ready for subclassing and instantiation:
+  /// it must have a completed instance layout and (under ObjCInterop)
+  /// must have been realized by the Objective-C runtime.
+  Complete,
+
+  /// A request for metadata that can be used for type layout; that is,
+  /// the type's value witness table must be completely initialized.
+  LayoutComplete,
+
+  /// A request for a metadata pointer that fully identifies the type.
+  /// Basic type structure, such as the type context descriptor and the
+  /// list of generic arguments, should have been installed, but there is
+  /// no requirement for a valid value witness table.
+  Abstract,
 };
 
-/// Something that can be static_asserted in all the places where we do
-/// comparisons on metadata states.
+/// Something that can be static_asserted in all the places where we depend
+/// on metadata state ordering.
 constexpr const bool MetadataStateIsReverseOrdered = true;
 
 /// Return true if the first metadata state is at least as advanced as the

branches/swift-5.0-branch/include/swift/AST/DiagnosticsSema.def

@@ -2930,9 +2930,6 @@ ERROR(fallthrough_into_case_with_var_binding,none,
 ERROR(unnecessary_cast_over_optionset,none,
       "unnecessary cast over raw value of %0", (Type))
 
-ERROR(mutability_mismatch_multiple_pattern_list,none,
-      "'%select{var|let}0' pattern binding must match previous "
-      "'%select{var|let}1' pattern binding", (bool, bool))
 ERROR(type_mismatch_multiple_pattern_list,none,
       "pattern variable bound to type %0, expected type %1", (Type, Type))
 ERROR(type_mismatch_fallthrough_pattern_list,none,
@@ -3166,9 +3163,6 @@ ERROR(tuple_ellipsis,none,
 WARNING(implicitly_unwrapped_optional_in_illegal_position_interpreted_as_optional,none,
         "using '!' is not allowed here; treating this as '?' instead", ())
 
-WARNING(implicitly_unwrapped_optional_deprecated_in_this_position,none,
-        "using '!' here is deprecated and will be removed in a future release", ())
-
 ERROR(implicitly_unwrapped_optional_in_illegal_position,none,
         "using '!' is not allowed here; perhaps '?' was intended?", ())
 

branches/swift-5.0-branch/include/swift/Demangling/Demangle.h

@@ -75,7 +75,7 @@ struct DemangleOptions {
 };
 
 class Node;
-using NodePointer = Node *;
+typedef Node *NodePointer;
 
 enum class FunctionSigSpecializationParamKind : unsigned {
   // Option Flags use bits 0-5. This give us 6 bits implying 64 entries to
@@ -133,7 +133,7 @@ class Node {
 #include "swift/Demangling/DemangleNodes.def"
   };
 
-  using IndexType = uint64_t;
+  typedef uint64_t IndexType;
 
   friend class NodeFactory;
 
@@ -182,10 +182,10 @@ class Node {
     assert(hasIndex());
     return IndexPayload;
   }
-
-  using iterator = NodePointer *;
-  using const_iterator = const NodePointer *;
-  using size_type = size_t;
+  
+  typedef NodePointer *iterator;
+  typedef const NodePointer *const_iterator;
+  typedef size_t size_type;
 
   bool hasChildren() const { return NumChildren != 0; }
   size_t getNumChildren() const { return NumChildren; }

branches/swift-5.0-branch/include/swift/Demangling/DemangleNodes.def

@@ -81,7 +81,6 @@ NODE(GenericPartialSpecialization)
 NODE(GenericPartialSpecializationNotReAbstracted)
 NODE(GenericProtocolWitnessTable)
 NODE(GenericProtocolWitnessTableInstantiationFunction)
-NODE(ResilientProtocolWitnessTable)
 NODE(GenericSpecialization)
 NODE(GenericSpecializationNotReAbstracted)
 NODE(GenericSpecializationParam)

branches/swift-5.0-branch/include/swift/Demangling/Demangler.h

@@ -207,7 +207,8 @@ template<typename T> class Vector {
   size_t Capacity = 0;
 
 public:
-  using iterator = T *;
+  
+  typedef T *iterator;
 
   Vector() { }