---

yaml
---
r: 341341
b: refs/heads/rxwei-patch-1
c: ae065ff
h: refs/heads/master
i:
  341339: 2efae59

Author: swift-ci

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 591482114d0f2c3d03e4301443cf1b865828683d
+refs/heads/rxwei-patch-1: ae065ff2a5d0c4dc971cce3c6ab3f75e2ac34c5a
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/benchmark/single-source/AngryPhonebook.swift

@@ -13,7 +13,6 @@
 // This test is based on single-source/Phonebook, with
 // to test uppercase and lowercase ASCII string fast paths.
 import TestsUtils
-import Foundation
 
 public let AngryPhonebook = BenchmarkInfo(
   name: "AngryPhonebook",

branches/rxwei-patch-1/benchmark/single-source/BinaryFloatingPointConversionFromBinaryInteger.swift

@@ -13,7 +13,6 @@
 // This test checks performance of generic binary floating-point conversion from
 // a binary integer.
 
-import Foundation
 import TestsUtils
 
 #if swift(>=4.2)
@@ -110,7 +109,7 @@ extension MockBinaryInteger : BinaryInteger {
   var trailingZeroBitCount: Int {
     return _value.trailingZeroBitCount
   }
-  
+
   func isMultiple(of other: MockBinaryInteger<T>) -> Bool {
     return _value.isMultiple(of: other._value)
   }
@@ -211,4 +210,3 @@ public func run_BinaryFloatingPointConversionFromBinaryInteger(_ N: Int) {
 }
 
 #endif
-

branches/rxwei-patch-1/benchmark/single-source/BinaryFloatingPointProperties.swift

@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
 import TestsUtils
 
 public let BinaryFloatingPointPropertiesBinade = BenchmarkInfo(

branches/rxwei-patch-1/benchmark/single-source/BitCount.swift

@@ -13,7 +13,6 @@
 // This test checks performance of Swift bit count.
 // and mask operator.
 // rdar://problem/22151678
-import Foundation
 import TestsUtils
 
 public let BitCount = BenchmarkInfo(

branches/rxwei-patch-1/benchmark/single-source/BucketSort.swift

@@ -16,17 +16,16 @@
 // https://github.com/raywenderlich/swift-algorithm-club/tree/master/Bucket%20Sort
 //
 // It sorts an array of generic `SortableItem`s. If the type of `sortingAlgo`
-// is not known to the call site at line 90, the `sort` method can not be
+// is not known to the call site at line 89, the `sort` method can not be
 // specialized to integer array sorting, which will lead to a huge performance
 // loss. Since `SortingAlgorithm` and `InsertionSort` are declared to be
-// `public` and the lines 89-91 can not be inlined in `bucketSort` (due to
+// `public` and the lines 88-90 can not be inlined in `bucketSort` (due to
 // inlining heuristic limitations), compiler without ExistentialSpecializer
 // optimization can not achieve this feat. With ExistentialSpecializer which
 // enables generic specialization recursively in a call chain, we're able to
-// specialize line 90 for `InsertionSort` on integers.
+// specialize line 89 for `InsertionSort` on integers.
 
 import TestsUtils
-import Foundation
 
 public let BucketSort = BenchmarkInfo(
   name: "BucketSort",
@@ -117,7 +116,8 @@ let items: [Int] = {
 let buckets: [Bucket<Int>] = {
   let bucketCount = 10
   let maxValue = items.max()!.convertToInt()
-  let maxCapacity = Int(ceil(Double(maxValue + 1) / Double(bucketCount)))
+  let maxCapacity = Int(
+    (Double(maxValue + 1) / Double(bucketCount)).rounded(.up))
   return (0..<bucketCount).map { _ in Bucket<Int>(capacity: maxCapacity) }
 }()
 

branches/rxwei-patch-1/benchmark/single-source/ByteSwap.swift

@@ -13,7 +13,6 @@
 // This test checks performance of Swift byte swap.
 // rdar://problem/22151907
 
-import Foundation
 import TestsUtils
 
 public let ByteSwap = BenchmarkInfo(

branches/rxwei-patch-1/benchmark/single-source/CString.swift

@@ -13,6 +13,8 @@
 import TestsUtils
 #if os(Linux)
 import Glibc
+#elseif os(Windows)
+import MSVCRT
 #else
 import Darwin
 #endif

branches/rxwei-patch-1/benchmark/single-source/Calculator.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import TestsUtils
-import Foundation
 
 public let Calculator = BenchmarkInfo(
   name: "Calculator",
@@ -53,4 +52,3 @@ public func run_Calculator(_ N: Int) {
   }
   CheckResults(c == 0)
 }
-

branches/rxwei-patch-1/benchmark/single-source/Hanoi.swift

@@ -12,7 +12,6 @@
 
 // This test checks performance of Swift hanoi tower.
 // <rdar://problem/22151932>
-import Foundation
 import TestsUtils
 
 public let Hanoi = BenchmarkInfo(

branches/rxwei-patch-1/benchmark/single-source/OpenClose.swift

@@ -11,8 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import TestsUtils
-import Foundation
-
 
 // A micro benchmark for checking the speed of string-based enums.
 public let OpenClose = BenchmarkInfo(
@@ -38,4 +36,3 @@ public func run_OpenClose(_ N: Int) {
   }
   CheckResults(c == 0)
 }
-

branches/rxwei-patch-1/benchmark/single-source/ProtocolDispatch2.swift

@@ -15,7 +15,6 @@
 
 
 import TestsUtils
-import Foundation
 
 public let ProtocolDispatch2 = BenchmarkInfo(
   name: "ProtocolDispatch2",

branches/rxwei-patch-1/benchmark/single-source/RGBHistogram.swift

@@ -15,7 +15,6 @@
 //
 // Description:
 //     Create a sorted sparse RGB histogram from an array of 300 RGB values.
-import Foundation
 import TestsUtils
 
 public let RGBHistogram = [

branches/rxwei-patch-1/benchmark/single-source/Radix2CooleyTukey.swift

@@ -2,7 +2,13 @@
 //
 // Originally written by @owensd. Used with his permission.
 
-import Foundation
+#if os(Linux)
+import Glibc
+#elseif os(Windows)
+import MSVCRT
+#else
+import Darwin
+#endif
 import TestsUtils
 
 public var Radix2CooleyTukey = [

branches/rxwei-patch-1/benchmark/single-source/ReduceInto.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import TestsUtils
-import Foundation
 
 public let ReduceInto = [
   BenchmarkInfo(name: "FilterEvenUsingReduce", runFunction: run_FilterEvenUsingReduce, tags: [.validation, .api], legacyFactor: 10),

branches/rxwei-patch-1/benchmark/single-source/SortLettersInPlace.swift

@@ -12,7 +12,6 @@
 
 // This test checks performance and correctness of Swift sortInPlace on an
 // array of letters.
-import Foundation
 import TestsUtils
 
 public let SortLettersInPlace = BenchmarkInfo(

branches/rxwei-patch-1/benchmark/single-source/StringEdits.swift

@@ -13,6 +13,8 @@
 import TestsUtils
 #if os(Linux)
 import Glibc
+#elseif os(Windows)
+import MSVCRT
 #else
 import Darwin
 #endif

branches/rxwei-patch-1/benchmark/single-source/StringMatch.swift

@@ -13,6 +13,8 @@
 import TestsUtils
 #if os(Linux)
 import Glibc
+#elseif os(Windows)
+import MSVCRT
 #else
 import Darwin
 #endif

branches/rxwei-patch-1/benchmark/single-source/Walsh.swift

@@ -13,6 +13,8 @@
 import TestsUtils
 #if os(Linux)
 import Glibc
+#elseif os(Windows)
+import MSVCRT
 #else
 import Darwin
 #endif
@@ -89,4 +91,3 @@ public func run_Walsh(_ N: Int) {
     InverseWalshTransform(&data2)
   }
 }
-

branches/rxwei-patch-1/benchmark/utils/ArgParse.swift

@@ -10,7 +10,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Foundation
+#if os(Linux)
+import Glibc
+#elseif os(Windows)
+import MSVCRT
+#else
+import Darwin
+#endif
 
 enum ArgumentError: Error {
   case missingValue(String)

branches/rxwei-patch-1/benchmark/utils/DriverUtils.swift

@@ -12,6 +12,8 @@
 
 #if os(Linux)
 import Glibc
+#elseif os(Windows)
+import MSVCRT
 #else
 import Darwin
 import LibProc

branches/rxwei-patch-1/benchmark/utils/TestsUtils.swift

@@ -12,6 +12,8 @@
 
 #if os(Linux)
 import Glibc
+#elseif os(Windows)
+import MSVCRT
 #else
 import Darwin
 #endif

branches/rxwei-patch-1/cmake/modules/SwiftConfigureSDK.cmake

@@ -252,9 +252,8 @@ macro(configure_sdk_unix name architectures)
           "${SWIFT_ANDROID_NDK_PATH}/toolchains/${SWIFT_SDK_ANDROID_ARCH_${arch}_NDK_TRIPLE}-${SWIFT_ANDROID_NDK_GCC_VERSION}/prebuilt/${_swift_android_prebuilt_build}")
       endif()
     else()
-      if(NOT SWIFT_SDK_${prefix}_ARCH_${arch}_PATH)
-        set(SWIFT_SDK_${prefix}_ARCH_${arch}_PATH "/")
-      endif()
+      set(SWIFT_SDK_${prefix}_ARCH_${arch}_PATH "/" CACHE STRING "CMAKE_SYSROOT for ${prefix} ${arch}")
+
       if("${prefix}" STREQUAL "HAIKU")
         set(SWIFT_SDK_HAIKU_ARCH_${arch}_LIBC_INCLUDE_DIRECTORY "/system/develop/headers/posix" CACHE STRING "Path to C library headers")
         set(SWIFT_SDK_HAIKU_ARCH_${arch}_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY "/system/develop/headers" CACHE STRING "Path to C library architecture headers")

branches/rxwei-patch-1/include/swift/ABI/Metadata.h

@@ -1495,7 +1495,11 @@ struct TargetTupleTypeMetadata : public TargetMetadata<Runtime> {
     ConstTargetMetadataPointer<Runtime, swift::TargetMetadata> Type;
 
     /// The offset of the tuple element within the tuple.
+#if __APPLE__
     StoredSize Offset;
+#else
+    uint32_t Offset;
+#endif
 
     OpaqueValue *findIn(OpaqueValue *tuple) const {
       return (OpaqueValue*) (((char*) tuple) + Offset);
@@ -1506,6 +1510,9 @@ struct TargetTupleTypeMetadata : public TargetMetadata<Runtime> {
     }
   };
 
+  static_assert(sizeof(Element) == sizeof(StoredSize) * 2,
+                "element size should be two words");
+
   Element *getElements() {
     return reinterpret_cast<Element*>(this + 1);
   }

branches/rxwei-patch-1/include/swift/AST/AnyFunctionRef.h

@@ -52,12 +52,20 @@ class AnyFunctionRef {
     }
   }
 
-  CaptureInfo &getCaptureInfo() const {
+  const CaptureInfo &getCaptureInfo() const {
     if (auto *AFD = TheFunction.dyn_cast<AbstractFunctionDecl *>())
       return AFD->getCaptureInfo();
     return TheFunction.get<AbstractClosureExpr *>()->getCaptureInfo();
   }
 
+  void setCaptureInfo(const CaptureInfo &captures) const {
+    if (auto *AFD = TheFunction.dyn_cast<AbstractFunctionDecl *>()) {
+      AFD->setCaptureInfo(captures);
+      return;
+    }
+    TheFunction.get<AbstractClosureExpr *>()->setCaptureInfo(captures);
+  }
+
   void getLocalCaptures(SmallVectorImpl<CapturedValue> &Result) const {
     getCaptureInfo().getLocalCaptures(Result);
   }

branches/rxwei-patch-1/include/swift/AST/CaptureInfo.h

@@ -126,9 +126,9 @@ class CaptureInfo {
     : Captures(nullptr), DynamicSelf(nullptr), OpaqueValue(nullptr), Count(0),
       GenericParamCaptures(0), Computed(0) { }
 
-  bool hasBeenComputed() { return Computed; }
+  bool hasBeenComputed() const { return Computed; }
 
-  bool isTrivial() {
+  bool isTrivial() const {
     return Count == 0 && !GenericParamCaptures && !DynamicSelf && !OpaqueValue;
   }
 

branches/rxwei-patch-1/include/swift/AST/Decl.h

@@ -1932,6 +1932,9 @@ class PatternBindingEntry {
   /// The initializer context used for this pattern binding entry.
   llvm::PointerIntPair<DeclContext *, 1, bool> InitContextAndIsText;
 
+  /// Values captured by this initializer.
+  CaptureInfo Captures;
+
   friend class PatternBindingInitializer;
 
 public:
@@ -2025,6 +2028,9 @@ class PatternBindingEntry {
   /// \param omitAccessors Whether the computation should omit the accessors
   /// from the source range.
   SourceRange getSourceRange(bool omitAccessors = false) const;
+
+  const CaptureInfo &getCaptureInfo() const { return Captures; }
+  void setCaptureInfo(const CaptureInfo &captures) { Captures = captures; }
 };
 
 /// This decl contains a pattern and optional initializer for a set
@@ -2122,6 +2128,18 @@ class PatternBindingDecl final : public Decl,
 
   void setPattern(unsigned i, Pattern *Pat, DeclContext *InitContext);
 
+  DeclContext *getInitContext(unsigned i) const {
+    return getPatternList()[i].getInitContext();
+  }
+
+  const CaptureInfo &getCaptureInfo(unsigned i) const {
+    return getPatternList()[i].getCaptureInfo();
+  }
+
+  void setCaptureInfo(unsigned i, const CaptureInfo &captures) {
+    getMutablePatternList()[i].setCaptureInfo(captures);
+  }
+
   /// Given that this PBD is the parent pattern for the specified VarDecl,
   /// return the entry of the VarDecl in our PatternList.  For example, in:
   ///
@@ -5847,8 +5865,8 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
   /// Retrieve the source range of the function declaration name + patterns.
   SourceRange getSignatureSourceRange() const;
 
-  CaptureInfo &getCaptureInfo() { return Captures; }
   const CaptureInfo &getCaptureInfo() const { return Captures; }
+  void setCaptureInfo(const CaptureInfo &captures) { Captures = captures; }
 
   /// Retrieve the Objective-C selector that names this method.
   ObjCSelector getObjCSelector(DeclName preferredName = DeclName(),

branches/rxwei-patch-1/include/swift/AST/DiagnosticsFrontend.def

@@ -254,6 +254,10 @@ WARNING(cannot_assign_value_to_conditional_compilation_flag,none,
         "conditional compilation flags do not have values in Swift; they are "
         "either present or absent (rather than '%0')", (StringRef))
 
+WARNING(framework_search_path_includes_framework_extension,none,
+        "framework search path ends in \".framework\"; add directory containing "
+        "framework instead: %0", (StringRef))
+
 ERROR(error_optimization_remark_pattern, none, "%0 in '%1'",
       (StringRef, StringRef))
 

branches/rxwei-patch-1/include/swift/AST/DiagnosticsSema.def

@@ -2595,6 +2595,8 @@ ERROR(dynamic_self_invalid_subscript,none,
       "covariant 'Self' can only appear at the top level of subscript element type", ())
 ERROR(dynamic_self_invalid_method,none,
       "covariant 'Self' can only appear at the top level of method result type", ())
+ERROR(dynamic_self_stored_property_init,none,
+      "covariant 'Self' type cannot be referenced from a stored property initializer", ())
 
 //------------------------------------------------------------------------------
 // MARK: Type Check Attributes
@@ -4448,6 +4450,9 @@ ERROR(property_wrapper_type_requirement_not_accessible,none,
       "more restrictive access than its enclosing property wrapper type %3 "
       "(which is %select{private|fileprivate|internal|public|open}4)",
       (AccessLevel, DescriptiveDeclKind, DeclName, Type, AccessLevel))
+ERROR(property_wrapper_ambiguous_enclosing_self_subscript, none,
+      "property wrapper type %0 has multiple enclosing-self subscripts %1",
+      (Type, DeclName))
 
 ERROR(property_wrapper_attribute_not_on_property, none,
       "property wrapper attribute %0 can only be applied to a property",