---

yaml
---
r: 335735
b: refs/heads/rxwei-patch-1
c: d006c53
h: refs/heads/master
i:
  335733: 47d217b
  335731: bfe3cab
  335727: 5023812

Author: compnerd

[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: b51b60b2275128b7443809211fa5d321b0d1f7cc
+refs/heads/rxwei-patch-1: d006c53a4a94e9d967902e240b6c51844f10039f
 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/CHANGELOG.md

@@ -99,6 +99,11 @@ Swift 5.1
   foo(0) // prints "Any" in Swift < 5.1, "T" in Swift 5.1
   ```
 
+* [SE-0245][]:
+
+  `Array` and `ContiguousArray` now have `init(unsafeUninitializedCapacity:initializingWith:)`,
+  which provides access to the array's uninitialized storage.
+
 **Add new entries to the top of this section, not here!**
 
 Swift 5.0
@@ -7506,6 +7511,7 @@ Swift 1.0
 [SE-0228]: <https://github.com/apple/swift-evolution/blob/master/proposals/0228-fix-expressiblebystringinterpolation.md>
 [SE-0230]: <https://github.com/apple/swift-evolution/blob/master/proposals/0230-flatten-optional-try.md>
 [SE-0235]: <https://github.com/apple/swift-evolution/blob/master/proposals/0235-add-result.md>
+[SE-0245]: <https://github.com/apple/swift-evolution/blob/master/proposals/0245-array-uninitialized-initializer.md>
 
 [SR-106]: <https://bugs.swift.org/browse/SR-106>
 [SR-419]: <https://bugs.swift.org/browse/SR-419>

branches/rxwei-patch-1/CMakeLists.txt

@@ -883,12 +883,11 @@ find_package(PythonInterp REQUIRED)
 # Find optional dependencies.
 #
 
-# Find libxml.
-# FIXME: unify with CLANG_HAVE_LIBXML, which is set in LLVM anyway.
-find_package(LibXml2)
-option(SWIFT_HAVE_LIBXML
-    "Whether to build with libxml"
-    ${LIBXML2_FOUND})
+if(LLVM_ENABLE_LIBXML2)
+  find_package(Libxml2 REQUIRED)
+else()
+  find_package(LibXml2)
+endif()
 
 # You need libedit linked in order to check if you have el_wgets.
 cmake_push_check_state()

branches/rxwei-patch-1/README.md

@@ -71,6 +71,8 @@ several hours. Naturally, incremental builds are much faster.
 macOS, Ubuntu Linux LTS, and the latest Ubuntu Linux release are the current
 supported host development operating systems.
 
+Please make sure you use Python 2.x. Python 3.x is not supported currently.
+
 #### macOS
 
 To build for macOS, you need [Xcode 10.2 beta](https://developer.apple.com/xcode/downloads/).
@@ -295,7 +297,7 @@ To read the compiler documentation, start by installing the
 [Sphinx](http://sphinx-doc.org) documentation generator tool by running the
 command:
 
-    easy_install -U Sphinx
+    easy_install -U "Sphinx < 2.0"
 
 Once complete, you can build the Swift documentation by changing directory into
 [docs](https://github.com/apple/swift/tree/master/docs) and typing `make`. This

branches/rxwei-patch-1/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

@@ -314,7 +314,6 @@ function (swift_benchmark_compile_archopts)
 
   set(common_options
       "-c"
-      "-Xfrontend" "-verify-sil-ownership"
       "-target" "${target}"
       "-${BENCH_COMPILE_ARCHOPTS_OPT}" ${PAGE_ALIGNMENT_OPTION})
 
@@ -344,7 +343,6 @@ function (swift_benchmark_compile_archopts)
 
   set(common_options_driver
       "-c"
-      "-Xfrontend" "-verify-sil-ownership"
       "-target" "${target}"
       "-${driver_opt}")
 

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

@@ -11,19 +11,64 @@
 //===----------------------------------------------------------------------===//
 
 // <rdar://problem/19003201>
+#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+
 import TestsUtils
 import Foundation
 
-public let NSStringConversion = BenchmarkInfo(
-  name: "NSStringConversion",
-  runFunction: run_NSStringConversion,
-  tags: [.validation, .api, .String, .bridging])
+fileprivate var test:NSString = ""
+
+public let NSStringConversion = [
+  BenchmarkInfo(name: "NSStringConversion",
+                runFunction: run_NSStringConversion,
+                tags: [.validation, .api, .String, .bridging]),
+  BenchmarkInfo(name: "NSStringConversion.UTF8",
+                runFunction: run_NSStringConversion_nonASCII,
+                tags: [.validation, .api, .String, .bridging],
+                setUpFunction: { test = NSString(cString: "tëst", encoding: String.Encoding.utf8.rawValue)! }),
+  BenchmarkInfo(name: "NSStringConversion.Mutable",
+                runFunction: run_NSMutableStringConversion,
+                tags: [.validation, .api, .String, .bridging],
+                setUpFunction: { test = NSMutableString(cString: "test", encoding: String.Encoding.ascii.rawValue)! }),
+  BenchmarkInfo(name: "NSStringConversion.Long",
+                runFunction: run_NSStringConversion_long,
+                tags: [.validation, .api, .String, .bridging],
+                setUpFunction: { test = NSString(cString: "The quick brown fox jumps over the lazy dog", encoding: String.Encoding.ascii.rawValue)! } ),
+  BenchmarkInfo(name: "NSStringConversion.LongUTF8",
+                runFunction: run_NSStringConversion_longNonASCII,
+                tags: [.validation, .api, .String, .bridging],
+                setUpFunction: { test = NSString(cString: "Thë qüick bröwn föx jumps over the lazy dög", encoding: String.Encoding.utf8.rawValue)! })]
 
 public func run_NSStringConversion(_ N: Int) {
-#if _runtime(_ObjC)
 let test:NSString = NSString(cString: "test", encoding: String.Encoding.ascii.rawValue)!
   for _ in 1...N * 10000 {
+    //Doesn't test accessing the String contents to avoid changing historical benchmark numbers
     blackHole(identity(test) as String)
   }
-#endif
 }
+
+fileprivate func innerLoop(_ str: NSString, _ N: Int, _ scale: Int = 5000) {
+  for _ in 1...N * scale {
+    for char in (identity(str) as String).utf8 {
+      blackHole(char)
+    }
+  }
+}
+
+public func run_NSStringConversion_nonASCII(_ N: Int) {
+  innerLoop(test, N, 2500)
+}
+
+public func run_NSMutableStringConversion(_ N: Int) {
+  innerLoop(test, N)
+}
+
+public func run_NSStringConversion_long(_ N: Int) {
+  innerLoop(test, N, 1000)
+}
+
+public func run_NSStringConversion_longNonASCII(_ N: Int) {
+  innerLoop(test, N, 300)
+}
+
+#endif

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

@@ -92,7 +92,9 @@ import MonteCarloPi
 import NibbleSort
 import NSDictionaryCastToSwift
 import NSError
+#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 import NSStringConversion
+#endif
 import NopDeinit
 import ObjectAllocation
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
@@ -262,7 +264,9 @@ registerBenchmark(MonteCarloE)
 registerBenchmark(MonteCarloPi)
 registerBenchmark(NSDictionaryCastToSwift)
 registerBenchmark(NSErrorTest)
+#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 registerBenchmark(NSStringConversion)
+#endif
 registerBenchmark(NibbleSort)
 registerBenchmark(NopDeinit)
 registerBenchmark(ObjectAllocation)

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

@@ -236,7 +236,6 @@ function(_compile_swift_files
   endif()
 
   if(SWIFTFILE_IS_STDLIB)
-    list(APPEND swift_flags "-Xfrontend" "-verify-sil-ownership")
     list(APPEND swift_flags "-Xfrontend" "-enable-mandatory-semantic-arc-opts")
   endif()
 

branches/rxwei-patch-1/docs/WindowsBuild.md

@@ -125,7 +125,7 @@ cmake -G Ninja^
  -DLLVM_ENABLE_ASSERTIONS=ON^
  -DLLVM_ENABLE_PDB=YES^
  -DLLVM_ENABLE_PROJECTS=clang^
- -DLLVM_TARGETS_TO_BUILD=X86^
+ -DLLVM_TARGETS_TO_BUILD="AArch64;ARM;X86"^
  S:/llvm
 popd
 cmake --build "S:\b\llvm"
@@ -208,7 +208,7 @@ cmake -G Ninja^
   -DLLDB_PATH_TO_LLVM_BUILD="S:\b\llvm"^
   -DLLDB_PATH_TO_SWIFT_BUILD="S:\b\swift"^
   -DLLVM_ENABLE_ASSERTIONS=ON^
-  -DPYTHON_HOME=%ProgramFiles(x86)%\Microsoft Visual Studio\Shared\Python37_64^
+  -DPYTHON_HOME="%ProgramFiles(x86)%\Microsoft Visual Studio\Shared\Python37_64"^
   S:\lldb
 popd
 cmake --build S:\b\lldb

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

@@ -4715,7 +4715,7 @@ class VarDecl : public AbstractStorageDecl {
   /// Set \p v to be the pattern produced VarDecl that is the parent of this
   /// var decl.
   void setParentVarDecl(VarDecl *v) {
-    assert(v);
+    assert(v && v != this);
     Parent = v;
   }
 
@@ -4906,7 +4906,7 @@ class ParamDecl : public VarDecl {
   SourceLoc SpecifierLoc;
 
   struct StoredDefaultArgument {
-    Expr *DefaultArg = nullptr;
+    PointerUnion<Expr *, VarDecl *> DefaultArg;
     Initializer *InitContext = nullptr;
     StringRef StringRepresentation;
   };
@@ -4963,12 +4963,20 @@ class ParamDecl : public VarDecl {
 
   Expr *getDefaultValue() const {
     if (auto stored = DefaultValueAndFlags.getPointer())
-      return stored->DefaultArg;
+      return stored->DefaultArg.dyn_cast<Expr *>();
+    return nullptr;
+  }
+
+  VarDecl *getStoredProperty() const {
+    if (auto stored = DefaultValueAndFlags.getPointer())
+      return stored->DefaultArg.dyn_cast<VarDecl *>();
     return nullptr;
   }
 
   void setDefaultValue(Expr *E);
 
+  void setStoredProperty(VarDecl *var);
+
   Initializer *getDefaultArgumentInitContext() const {
     if (auto stored = DefaultValueAndFlags.getPointer())
       return stored->InitContext;
@@ -5561,12 +5569,14 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
 
 class OperatorDecl;
 
-/// Note: These align with '%select's in diagnostics.
 enum class SelfAccessKind : uint8_t {
-  NonMutating = 0,
-  Mutating    = 1,
-  __Consuming = 2,
+  NonMutating,
+  Mutating,
+  __Consuming,
 };
+
+/// Diagnostic printing of \c SelfAccessKind.
+llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, SelfAccessKind SAK);
 
 /// FuncDecl - 'func' declaration.
 class FuncDecl : public AbstractFunctionDecl {

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

@@ -52,6 +52,10 @@ enum class DefaultArgumentKind : uint8_t {
   EmptyArray,
   /// An empty dictionary literal.
   EmptyDictionary,
+  /// A reference to the stored property. This is a special default argument
+  /// kind for the synthesized memberwise constructor to emit a call to the
+  // property's initializer.
+  StoredProperty,
 };
 enum { NumDefaultArgumentKindBits = 4 };
 

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

@@ -30,6 +30,7 @@ namespace swift {
   class ValueDecl;
 
   enum class PatternKind : uint8_t;
+  enum class SelfAccessKind : uint8_t;
   enum class ReferenceOwnership : uint8_t;
   enum class StaticSpellingKind : uint8_t;
   enum class DescriptiveDeclKind : uint8_t;
@@ -77,6 +78,7 @@ namespace swift {
     Type,
     TypeRepr,
     PatternKind,
+    SelfAccessKind,
     ReferenceOwnership,
     StaticSpellingKind,
     DescriptiveDeclKind,
@@ -105,6 +107,7 @@ namespace swift {
       Type TypeVal;
       TypeRepr *TyR;
       PatternKind PatternKindVal;
+      SelfAccessKind SelfAccessKindVal;
       ReferenceOwnership ReferenceOwnershipVal;
       StaticSpellingKind StaticSpellingKindVal;
       DescriptiveDeclKind DescriptiveDeclKindVal;
@@ -169,6 +172,10 @@ namespace swift {
         : Kind(DiagnosticArgumentKind::ReferenceOwnership),
           ReferenceOwnershipVal(RO) {}
 
+    DiagnosticArgument(SelfAccessKind SAK)
+        : Kind(DiagnosticArgumentKind::SelfAccessKind),
+          SelfAccessKindVal(SAK) {}
+
     DiagnosticArgument(StaticSpellingKind SSK)
         : Kind(DiagnosticArgumentKind::StaticSpellingKind),
           StaticSpellingKindVal(SSK) {}
@@ -249,6 +256,11 @@ namespace swift {
       return ReferenceOwnershipVal;
     }
 
+    SelfAccessKind getAsSelfAccessKind() const {
+      assert(Kind == DiagnosticArgumentKind::SelfAccessKind);
+      return SelfAccessKindVal;
+    }
+
     StaticSpellingKind getAsStaticSpellingKind() const {
       assert(Kind == DiagnosticArgumentKind::StaticSpellingKind);
       return StaticSpellingKindVal;

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

@@ -1108,24 +1108,20 @@ ERROR(attribute_requires_operator_identifier,none,
 ERROR(attribute_requires_single_argument,none,
       "'%0' requires a function with one argument", (StringRef))
 
-ERROR(mutating_invalid_global_scope,none,
-      "'%select{nonmutating|mutating|__consuming}0' is only valid on methods",
-      (unsigned))
-ERROR(mutating_invalid_classes,none,
-      "'%select{nonmutating|mutating|__consuming}0' isn't valid on methods in "
-      "classes or class-bound protocols", (bool))
+ERROR(mutating_invalid_global_scope,none, "%0 is only valid on methods",
+      (SelfAccessKind))
+ERROR(mutating_invalid_classes,none, "%0 isn't valid on methods in "
+      "classes or class-bound protocols", (SelfAccessKind))
 
 ERROR(functions_mutating_and_not,none,
-      "method must not be declared both "
-      "%select{nonmutating|mutating|__consuming}0 and "
-      "%select{nonmutating|mutating|__consuming}1",
-      (unsigned, unsigned))
+      "method must not be declared both %0 and %1",
+      (SelfAccessKind, SelfAccessKind))
 ERROR(static_functions_not_mutating,none,
       "static functions must not be declared mutating", ())
 
 ERROR(modify_mutatingness_differs_from_setter,none,
-      "'modify' accessor cannot be %select{nonmutating|mutating}0 "
-      "when the setter is %select{mutating|nonmutating}0", (bool))
+      "'modify' accessor cannot be %0 when the setter is %1",
+      (SelfAccessKind, SelfAccessKind))
 
 ERROR(transparent_in_protocols_not_supported,none,
       "'@_transparent' attribute is not supported on declarations within protocols", ())
@@ -1522,6 +1518,8 @@ ERROR(extension_specialization,none,
       "type %0 with constraints specified by a 'where' clause", (Identifier))
 ERROR(extension_stored_property,none,
       "extensions must not contain stored properties", ())
+NOTE(extension_stored_property_fixit,none,
+     "Remove '=' to make %0 a computed property", (Identifier))
 ERROR(extension_nongeneric_trailing_where,none,
       "trailing 'where' clause for extension of non-generic type %0",
       (DeclName))
@@ -1871,8 +1869,8 @@ NOTE(protocol_witness_prefix_postfix_conflict,none,
      "candidate is %select{|prefix, |postfix, }1not "
      "%select{prefix|postfix}0 as required", (bool, unsigned))
 NOTE(protocol_witness_mutation_modifier_conflict,none,
-     "candidate is marked '%select{nonmutating|mutating|__consuming}0' but "
-     "protocol does not allow it", (unsigned))
+     "candidate is marked %0 but protocol does not allow it",
+     (SelfAccessKind))
 NOTE(protocol_witness_settable_conflict,none,
      "candidate is not settable, but protocol requires it", ())
 NOTE(protocol_witness_rethrows_conflict,none,

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

@@ -67,6 +67,7 @@ PROTOCOL(Error)
 PROTOCOL_(ErrorCodeProtocol)
 PROTOCOL(OptionSet)
 PROTOCOL(CaseIterable)
+PROTOCOL(SIMDScalar)
 
 PROTOCOL_(BridgedNSError)
 PROTOCOL_(BridgedStoredNSError)

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

@@ -810,6 +810,14 @@ class FileUnit : public DeclContext {
     return nullptr;
   }
 
+  /// Returns the name to use when referencing entities in this file.
+  ///
+  /// Usually this is the module name itself, but certain Clang features allow
+  /// substituting another name instead.
+  virtual StringRef getExportedModuleName() const {
+    return getParentModule()->getName().str();
+  }
+
   /// Traverse the decls within this file.
   ///
   /// \returns true if traversal was aborted, false if it completed