---

yaml
---
r: 341503
b: refs/heads/rxwei-patch-1
c: 95eea2f
h: refs/heads/master
i:
  341501: 31d1629
  341499: 56e1a9b
  341495: 11192cf
  341487: 24f8390
  341471: 6d89038
  341439: df109e1
  341375: 2994580
  341247: 0ae5c1c
  340991: 70f7c1d

Author: broadwaylamb

[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: 3cc6376459342e32060f0fe78b2d0042600dd190
+refs/heads/rxwei-patch-1: 95eea2f3e915f53ffea667e912924292ed39d1ad
 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/README.md

@@ -17,7 +17,7 @@
 |**[Debian 9.1 (Raspberry Pi)](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/armv7_debian_stretch.json)** | ARMv7 | [![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_1/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-debian-9_1)|
 |**[Fedora 27](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_fedora_27.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-fedora-27/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-fedora-27)|
 |**[Ubuntu 16.04](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/x86_64_ubuntu_16_04.json)** | x86_64 |[![Build Status](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04)|
-|**[Ubuntu 16.04 ](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/ppc64le_ubuntu_16_04.json)** | PPC64LE |[![Build Status](https://ci-external.swift.org/job/oss-swift-5.1-RA-linux-ubuntu-16.04-ppc64le/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-5.1-RA-linux-ubuntu-16.04-ppc64le)|
+|**[Ubuntu 16.04 ](https://github.com/apple/swift-community-hosted-continuous-integration/blob/master/nodes/ppc64le_ubuntu_16_04.json)** | PPC64LE |[![Build Status](https://ci-external.swift.org/job/oss-swift-4.1-RA-linux-ubuntu-16.04-ppc64le/lastCompletedBuild/badge/icon)](https://ci-external.swift.org/job/oss-swift-4.1-RA-linux-ubuntu-16.04-ppc64le)|
 |**[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)|

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

@@ -14,59 +14,11 @@
 // to test uppercase and lowercase ASCII string fast paths.
 import TestsUtils
 
-let t: [BenchmarkCategory] = [.validation, .api, .String]
-
-public let AngryPhonebook = [
-  BenchmarkInfo(
-    name: "AngryPhonebook",
-    runFunction: run_AngryPhonebook,
-    tags: t,
-    legacyFactor: 7),
-
-  // Small String Workloads
-  BenchmarkInfo(
-    name: "AngryPhonebook.ASCII.Small",
-    runFunction: { angryPhonebook($0, ascii) },
-    tags: t,
-    setUpFunction: { blackHole(ascii) }),
-  BenchmarkInfo(
-    name: "AngryPhonebook.Strasse.Small",
-    runFunction: { angryPhonebook($0, strasse) },
-    tags: t,
-    setUpFunction: { blackHole(strasse) }),
-  BenchmarkInfo(
-    name: "AngryPhonebook.Armenian.Small",
-    runFunction: { angryPhonebook($0, armenian) },
-    tags: t,
-    setUpFunction: { blackHole(armenian) }),
-  BenchmarkInfo(
-    name: "AngryPhonebook.Cyrillic.Small",
-    runFunction: { angryPhonebook($0, cyrillic) },
-    tags: t,
-    setUpFunction: { blackHole(cyrillic) }),
-
-  // Regular String Workloads
-  BenchmarkInfo(
-    name: "AngryPhonebook.ASCII",
-    runFunction: { angryPhonebook($0, precomposed: longASCII) },
-    tags: t,
-    setUpFunction: { blackHole(longASCII) }),
-  BenchmarkInfo(
-    name: "AngryPhonebook.Strasse",
-    runFunction: { angryPhonebook($0, precomposed: longStrasse) },
-    tags: t,
-    setUpFunction: { blackHole(longStrasse) }),
-  BenchmarkInfo(
-    name: "AngryPhonebook.Armenian",
-    runFunction: { angryPhonebook($0, precomposed: longArmenian) },
-    tags: t,
-    setUpFunction: { blackHole(longArmenian) }),
-  BenchmarkInfo(
-    name: "AngryPhonebook.Cyrillic",
-    runFunction: { angryPhonebook($0, precomposed: longCyrillic) },
-    tags: t,
-    setUpFunction: { blackHole(longCyrillic) })
-]
+public let AngryPhonebook = BenchmarkInfo(
+  name: "AngryPhonebook",
+  runFunction: run_AngryPhonebook,
+  tags: [.validation, .api, .String],
+  legacyFactor: 7)
 
 let words = [
   "James", "John", "Robert", "Michael", "William", "David", "Richard", "Joseph",
@@ -86,67 +38,3 @@ public func run_AngryPhonebook(_ N: Int) {
     }
   }
 }
-
-// Workloads for various scripts. Always 20 names for 400 pairings.
-// To keep the performance of various scripts roughly comparable, aim for
-// a total length of approximately 120 characters.
-// E.g.: `ascii.joined(separator: "").count == 124`
-// Every name should fit in 15-bytes UTF-8 encoded, to excercise the small
-// string optimization.
-// E.g.: `armenian.allSatisfy { $0._guts.isSmall } == true`
-
-// Workload Size Statistics
-//   SMALL  | UTF-8 | UTF-16 |    REGULAR   |  UTF-8  | UTF-16
-// ---------|-------|--------|--------------|---------|--------
-//    ascii | 124 B |  248 B |    longASCII |  6158 B | 12316 B
-//  strasse | 140 B |  240 B |  longStrasse |  6798 B | 11996 B
-// armenian | 232 B |  232 B | longArmenian | 10478 B | 11676 B
-// cyrillic | 238 B |  238 B | longCyrillic | 10718 B | 11916 B
-
-let ascii = Array(words.prefix(20))
-// Pathological case, uppercase: ß -> SS
-let strasse = Array(repeating: "Straße", count: 20)
-
-let armenian = [
-  "Արմեն", "Աննա", "Հարութ", "Միքայել", "Մարիա", "Դավիթ", "Վարդան",
-  "Նարինե", "Տիգրան", "Տաթևիկ", "Թագուհի", "Թամարա", "Ազնաուր", "Գրիգոր",
-  "Կոմիտաս", "Հայկ", "Գառնիկ", "Վահրամ", "Վահագն", "Գևորգ"]
-
-let cyrillic = [
-  "Ульяна", "Аркадий", "Аня", "Даниил", "Дмитрий", "Эдуард", "Юрій", "Давид",
-  "Анна", "Дмитрий", "Евгений", "Борис", "Ксения", "Артур", "Аполлон",
-  "Соломон", "Николай", "Кристи", "Надежда", "Спартак"]
-
-/// Precompose the phonebook into one large string of comma separated names.
-func phonebook(_ names: [String]) -> String {
-  names.map { firstName in
-    names.map { lastName in
-      firstName + " " + lastName
-    }.joined(separator: ", ")
-  }.joined(separator: ", ")
-}
-
-let longASCII = phonebook(ascii)
-let longStrasse = phonebook(strasse)
-let longArmenian = phonebook(armenian)
-let longCyrillic = phonebook(cyrillic)
-
-@inline(never)
-public func angryPhonebook(_ N: Int, _ names: [String]) {
-  assert(names.count == 20)
-  // Permute the names.
-  for _ in 1...N {
-    for firstname in names {
-      for lastname in names {
-        blackHole((firstname.uppercased(), lastname.lowercased()))
-      }
-    }
-  }
-}
-
-@inline(never)
-public func angryPhonebook(_ N: Int, precomposed names: String) {
-  for _ in 1...N {
-    blackHole((names.uppercased(), names.lowercased()))
-  }
-}

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

@@ -1905,7 +1905,7 @@ function(add_swift_target_library name)
     if(SWIFTLIB_SHARED)
       if(sdk IN_LIST SWIFT_APPLE_PLATFORMS)
         list(APPEND swiftlib_link_flags_all "-dynamiclib -Wl,-headerpad_max_install_names")
-      elseif(${sdk} STREQUAL ANDROID)
+      elseif(sdk STREQUAL ANDROID)
         list(APPEND swiftlib_link_flags_all "-shared")
         # TODO: Instead of `lib${name}.so` find variable or target property which already have this value.
         list(APPEND swiftlib_link_flags_all "-Wl,-soname,lib${name}.so")

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

@@ -70,6 +70,7 @@ namespace swift {
   class GenericSignature;
   class GenericTypeParamDecl;
   class GenericTypeParamType;
+  class LazyResolver;
   class ModuleDecl;
   class EnumCaseDecl;
   class EnumElementDecl;
@@ -3955,7 +3956,10 @@ class ClassDecl final : public NominalTypeDecl {
 
   /// Determine whether this class inherits the convenience initializers
   /// from its superclass.
-  bool inheritsSuperclassInitializers();
+  ///
+  /// \param resolver Used to resolve the signatures of initializers, which is
+  /// required for name lookup.
+  bool inheritsSuperclassInitializers(LazyResolver *resolver);
 
   /// Marks that this class inherits convenience initializers from its
   /// superclass.
@@ -4139,7 +4143,7 @@ class ProtocolDecl final : public NominalTypeDecl {
 
   bool existentialConformsToSelfSlow();
 
-  bool existentialTypeSupportedSlow();
+  bool existentialTypeSupportedSlow(LazyResolver *resolver);
 
   ArrayRef<ProtocolDecl *> getInheritedProtocolsSlow();
 
@@ -4265,12 +4269,12 @@ class ProtocolDecl final : public NominalTypeDecl {
   /// conforming to this protocol. This is only permitted if the types of
   /// all the members do not contain any associated types, and do not
   /// contain 'Self' in 'parameter' or 'other' position.
-  bool existentialTypeSupported() const {
+  bool existentialTypeSupported(LazyResolver *resolver) const {
     if (Bits.ProtocolDecl.ExistentialTypeSupportedValid)
       return Bits.ProtocolDecl.ExistentialTypeSupported;
 
     return const_cast<ProtocolDecl *>(this)
-             ->existentialTypeSupportedSlow();
+             ->existentialTypeSupportedSlow(resolver);
   }
 
   /// Explicitly set the existentialTypeSupported flag, without computing

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

@@ -216,6 +216,8 @@ ERROR(expected_decl,none,
       "expected declaration", ())
 ERROR(expected_identifier_in_decl,none,
       "expected identifier in %0 declaration", (StringRef))
+ERROR(expected_keyword_in_decl,none,
+      "expected '%0' keyword in %1 declaration", (StringRef, StringRef))
 ERROR(number_cant_start_decl_name,none,
       "%0 name can only start with a letter or underscore, not a number",
       (StringRef))