---

yaml
---
r: 341467
b: refs/heads/rxwei-patch-1
c: 49bdc45
h: refs/heads/master
i:
  341465: 35dbcb4
  341463: ee2e495

Author: hamishknight

[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: dfb90b7e1c1b390c89f12098f69d7b5f962cbf16
+refs/heads/rxwei-patch-1: 49bdc45dc9c8b6e9fd741047bd86b653c3785120
 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/docs/ObjCInterop.md

@@ -76,18 +76,6 @@ class AnyFunctionRef {
     return !TheFunction.get<AbstractClosureExpr *>()->getType().isNull();
   }
 
-  bool hasSingleExpressionBody() const {
-    if (auto *AFD = TheFunction.dyn_cast<AbstractFunctionDecl *>())
-      return AFD->hasSingleExpressionBody();
-    return TheFunction.get<AbstractClosureExpr *>()->hasSingleExpressionBody();
-  }
-
-  Expr *getSingleExpressionBody() const {
-    if (auto *AFD = TheFunction.dyn_cast<AbstractFunctionDecl *>())
-      return AFD->getSingleExpressionBody();
-    return TheFunction.get<AbstractClosureExpr *>()->getSingleExpressionBody();
-  }
-
   Type getType() const {
     if (auto *AFD = TheFunction.dyn_cast<AbstractFunctionDecl *>())
       return AFD->getInterfaceType();

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

@@ -551,20 +551,6 @@ BUILTIN_MISC_OPERATION(WillThrow, "willThrow", "", Special)
 /// poundAssert has type (Builtin.Int1, Builtin.RawPointer) -> ().
 BUILTIN_MISC_OPERATION(PoundAssert, "poundAssert", "", Special)
 
-// BUILTIN_MISC_OPERATION_WITH_SILGEN - Miscellaneous operations that are
-// specially emitted during SIL generation.
-#ifndef BUILTIN_MISC_OPERATION_WITH_SILGEN
-#define BUILTIN_MISC_OPERATION_WITH_SILGEN(Id, Name, Attrs, Overload) \
-  BUILTIN_MISC_OPERATION(Id, Name, Attrs, Overload)
-#endif
-
-/// globalStringTablePointer has type String -> Builtin.RawPointer.
-/// It returns an immortal, global string table pointer for strings constructed
-/// from string literals.
-BUILTIN_MISC_OPERATION_WITH_SILGEN(GlobalStringTablePointer, "globalStringTablePointer", "", Special)
-
-#undef BUILTIN_MISC_OPERATION_WITH_SILGEN
-
 #undef BUILTIN_MISC_OPERATION
 
 /// Builtins for instrumentation added by sanitizers during SILGen.

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

@@ -91,6 +91,10 @@ WARNING(implicit_bridging_header_imported_from_module,none,
         "is deprecated and will be removed in a later version of Swift",
         (StringRef, Identifier))
 
+WARNING(clang_vfs_overlay_is_ignored,none,
+        "ignoring '-ivfsoverlay' options provided to '-Xcc' in favor of "
+        "'-vfsoverlay'", ())
+
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

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

@@ -113,12 +113,6 @@ ERROR(unsupported_c_function_pointer_conversion,none,
       "C function pointer signature %0 is not compatible with expected type %1",
       (Type, Type))
 
-ERROR(c_function_pointer_from_function_with_context,none,
-      "a C function pointer cannot be formed from a "
-      "%select{local function|closure}0 that captures "
-      "%select{context|generic parameters|dynamic Self type|<<error>}1",
-      (bool, unsigned))
-
 ERROR(objc_selector_malformed,none,"the type ObjectiveC.Selector is malformed",
       ())
 
@@ -484,7 +478,7 @@ NOTE(switch_value_case_doesnt_yield, none, "missing yield in the %0 case",
 NOTE(try_branch_doesnt_yield, none, "missing yield when error is "
      "%select{not |}0thrown", (bool))
 
-// OS log optimization diagnostics.
+// OS log optimization dianostics.
 
 ERROR(oslog_message_argument_not_found, none, "no argument of type %0 in "
   " the os log call", (Identifier))
@@ -505,9 +499,6 @@ ERROR(oslog_non_constant_interpolation, none, "'OSLogInterpolation' struct is "
 ERROR(oslog_property_not_constant, none, "'OSLogInterpolation.%0' is not a "
       "constant: formatting and privacy options must be literals", (StringRef))
 
-ERROR(global_string_pointer_on_non_constant, none, "globalStringTablePointer "
-      "builtin must used only on string literals", ())
-
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

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

@@ -1121,6 +1121,11 @@ ERROR(c_function_pointer_from_method,none,
 ERROR(c_function_pointer_from_generic_function,none,
       "a C function pointer cannot be formed from a reference to a generic "
       "function", ())
+ERROR(c_function_pointer_from_function_with_context,none,
+      "a C function pointer cannot be formed from a "
+      "%select{local function|closure}0 that captures "
+      "%select{context|generic parameters|dynamic Self type|<<error>}1",
+      (bool, unsigned))
 ERROR(invalid_autoclosure_forwarding,none,
       "add () to forward @autoclosure parameter", ())
 
@@ -3332,9 +3337,6 @@ ERROR(trailing_closure_requires_parens,none,
       "trailing closure requires parentheses for disambiguation in this"
       " context", ())
 
-ERROR(opaque_type_var_no_init,none,
-      "property declares an opaque return type, but has no initializer "
-      "expression from which to infer an underlying type", ())
 ERROR(opaque_type_no_underlying_type_candidates,none,
       "function declares an opaque return type, but has no return statements "
       "in its body from which to infer an underlying type", ())
@@ -3346,9 +3348,6 @@ NOTE(opaque_type_underlying_type_candidate_here,none,
 ERROR(opaque_type_self_referential_underlying_type,none,
       "function opaque return type was inferred as %0, which defines the "
       "opaque type in terms of itself", (Type))
-ERROR(opaque_type_var_no_underlying_type,none,
-      "property declares an opaque return type, but cannot infer the "
-      "underlying type from its initializer expression", ())
 
 //------------------------------------------------------------------------------
 // MARK: Type Check Patterns