---

yaml
---
r: 341887
b: refs/heads/rxwei-patch-1
c: 8f1a9b4
h: refs/heads/master
i:
  341885: 417932a
  341883: 6386e33
  341879: 1e862e5
  341871: d4a0302
  341855: 2c10425
  341823: c7588a9
  341759: cf9612b

Author: nkcsgexi

[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: 8880aaef1ffa7e3ea7894ac89039694bc9935867
+refs/heads/rxwei-patch-1: 8f1a9b47893dc66e74a7991c0be8cebf9c7626f7
 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/CMakeLists.txt

@@ -79,7 +79,6 @@ set(SWIFT_BENCH_MODULES
     single-source/DictionarySubscriptDefault
     single-source/DictionarySwap
     single-source/Diffing
-    single-source/DiffingMyers
     single-source/DropFirst
     single-source/DropLast
     single-source/DropWhile
@@ -106,6 +105,7 @@ set(SWIFT_BENCH_MODULES
     single-source/Memset
     single-source/MonteCarloE
     single-source/MonteCarloPi
+    single-source/Myers
     single-source/NSDictionaryCastToSwift
     single-source/NSError
     single-source/NSStringConversion

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

@@ -15,55 +15,111 @@ import TestsUtils
 let t: [BenchmarkCategory] = [.api]
 public let Diffing = [
   BenchmarkInfo(
-    name: "Diffing.Same",
-    runFunction: { diff($0, from: longPangram, to: longPangram) },
+    name: "DiffSame",
+    runFunction: run_DiffSame,
     tags: t,
-    setUpFunction: { blackHole(longPangram) }),
+    legacyFactor: 10),
   BenchmarkInfo(
-    name: "Diffing.PangramToAlphabet",
-    runFunction: { diff($0, from: longPangram, to: alphabets) },
+    name: "DiffPangramToAlphabet",
+    runFunction: run_DiffPangramToAlphabet,
     tags: t,
-    setUpFunction: { blackHole((longPangram, alphabets)) }),
+    legacyFactor: 10),
   BenchmarkInfo(
-    name: "Diffing.Pangrams",
-    runFunction: { diff($0, from:typingPangram, to: longPangram) },
+    name: "DiffPangrams",
+    runFunction: run_DiffPangrams,
     tags: t,
-    setUpFunction: { blackHole((longPangram, typingPangram)) }),
+    legacyFactor: 10),
   BenchmarkInfo(
-    name: "Diffing.ReversedAlphabets",
-    runFunction: { diff($0, from:alphabets, to: alphabetsReversed) },
+    name: "DiffReversedAlphabets",
+    runFunction: run_DiffReversedAlphabets,
     tags: t,
-    setUpFunction: { blackHole((alphabets, alphabetsReversed)) }),
+    legacyFactor: 10),
   BenchmarkInfo(
-    name: "Diffing.ReversedLorem",
-    runFunction: { diff($0, from: loremIpsum, to: loremReversed) },
+    name: "DiffReversedLorem",
+    runFunction: run_DiffReversedLorem,
     tags: t,
-    setUpFunction: { blackHole((loremIpsum, loremReversed)) }),
+    legacyFactor: 10),
   BenchmarkInfo(
-    name: "Diffing.Disparate",
-    runFunction: { diff($0, from: numbersAndSymbols, to: alphabets) },
+    name: "DiffDisparate",
+    runFunction: run_DiffDisparate,
     tags: t,
-    setUpFunction: { blackHole((numbersAndSymbols, alphabets)) }),
+    legacyFactor: 10),
   BenchmarkInfo(
-    name: "Diffing.Similar",
-    runFunction: { diff($0, from: unabridgedLorem, to: loremIpsum) },
+    name: "DiffSimilar",
+    runFunction: run_DiffSimilar,
     tags: t,
-    setUpFunction: { blackHole((unabridgedLorem, loremIpsum)) }),
+    legacyFactor: 10),
 ]
 
 let numbersAndSymbols = Array("0123456789`~!@#$%^&*()+=_-\"'?/<,>.\\{}'")
 let alphabets = Array("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-let alphabetsReversed = Array(alphabets.reversed())
+let alphabetsReversed = Array("ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba")
 let longPangram = Array("This pangram contains four As, one B, two Cs, one D, thirty Es, six Fs, five Gs, seven Hs, eleven Is, one J, one K, two Ls, two Ms, eighteen Ns, fifteen Os, two Ps, one Q, five Rs, twenty-seven Ss, eighteen Ts, two Us, seven Vs, eight Ws, two Xs, three Ys, & one Z")
 let typingPangram = Array("The quick brown fox jumps over the lazy dog")
 let loremIpsum = Array("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.")
 let unabridgedLorem = Array("Lorem ipsum, quia dolor sit amet consectetur adipisci[ng] velit, sed quia non-numquam [do] eius modi tempora inci[di]dunt, ut labore et dolore magnam aliqua.")
-let loremReversed = Array(loremIpsum.reversed())
+let loremReverse = Array(".auqila angam erolod te erobal tu tnudidicni ropmet domsuie od des ,tile gnicsipida rutetcesnoc ,tema tis rolod muspi meroL")
 
-@inline(never) func diff(_ N: Int, from older: [Character], to newer: [Character]) {
+
+@inline(never)
+public func run_DiffSame(_ N: Int) {
+  if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+    for _ in 1...N {
+      let _ = longPangram.difference(from: longPangram)
+    }
+  }
+}
+
+@inline(never)
+public func run_DiffPangramToAlphabet(_ N: Int) {
+  if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+    for _ in 1...N {
+      let _ = longPangram.difference(from: alphabets)
+    }
+  }
+}
+
+@inline(never)
+public func run_DiffPangrams(_ N: Int) {
+  if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+    for _ in 1...N {
+      let _ = longPangram.difference(from: typingPangram)
+    }
+  }
+}
+
+@inline(never)
+public func run_DiffReversedAlphabets(_ N: Int) {
+  if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+    for _ in 1...N {
+      let _ = alphabets.difference(from: alphabetsReversed)
+    }
+  }
+}
+
+@inline(never)
+public func run_DiffReversedLorem(_ N: Int) {
+  if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+    for _ in 1...N {
+      let _ = loremIpsum.difference(from: loremReverse)
+    }
+  }
+}
+
+@inline(never)
+public func run_DiffDisparate(_ N: Int) {
+  if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
+    for _ in 1...N {
+      let _ = alphabets.difference(from: numbersAndSymbols)
+    }
+  }
+}
+
+@inline(never)
+public func run_DiffSimilar(_ N: Int) {
   if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
     for _ in 1...N {
-      blackHole(newer.difference(from: older))
+      let _ = loremIpsum.difference(from: unabridgedLorem)
     }
   }
 }

branches/rxwei-patch-1/benchmark/single-source/DiffingMyers.swift renamed to branches/rxwei-patch-1/benchmark/single-source/Myers.swift

@@ -1,4 +1,4 @@
-//===--- DiffingMyers.swift -----------------------------------------------===//
+//===--- Myers.swift -------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -12,25 +12,18 @@
 
 import TestsUtils
 
-// The DiffingMyers test benchmarks Swift's performance running the algorithm
-// described in Myers (1986). The Diffing benchmark tracks the performance
-// of `Collection.difference(from:to:)`.
+public let Myers = [
+  BenchmarkInfo(name: "Myers", runFunction: run_Myers, tags: [.algorithm]),
+]
 
-public let DiffingMyers = BenchmarkInfo(
-  name: "Diffing.Myers.Similar",
-  runFunction: run_Myers,
-  tags: [.algorithm],
-  setUpFunction: { blackHole((loremIpsum, unabridgedLorem)) })
-
-
-let loremIpsum = Array("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.")
-let unabridgedLorem = Array("Lorem ipsum, quia dolor sit amet consectetur adipisci[ng] velit, sed quia non-numquam [do] eius modi tempora inci[di]dunt, ut labore et dolore magnam aliqua.")
+let loremShort = Array("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")
+let loremLong = Array("Sed ut perspiciatis, unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam eaque ipsa, quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt, explicabo. Nemo enim ipsam voluptatem, quia voluptas sit, aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos, qui ratione voluptatem sequi nesciunt, neque porro quisquam est, qui dolorem ipsum, quia dolor sit amet consectetur adipisci[ng] velit, sed quia non-numquam [do] eius modi tempora inci[di]dunt, ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum[d] exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit, qui in ea voluptate velit esse, quam nihil molestiae consequatur, vel illum, qui dolorem eum fugiat, quo voluptas nulla pariatur?")
 
 @inline(never)
 public func run_Myers(N: Int) {
   if #available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *) {
     for _ in 1...N {
-      blackHole(myers(from: unabridgedLorem, to: loremIpsum, using: ==))
+      let _ = myers(from: loremShort, to: loremLong, using: ==)
     }
   }
 }
@@ -200,4 +193,4 @@ fileprivate func myers<C,D>(
       return CollectionDifference(_formChanges(from: a, to: b, using:_descent(from: a, to: b)))!
     }
   }
-}
+}

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

@@ -67,7 +67,6 @@ import DictionaryRemove
 import DictionarySubscriptDefault
 import DictionarySwap
 import Diffing
-import DiffingMyers
 import DropFirst
 import DropLast
 import DropWhile
@@ -94,6 +93,7 @@ import MapReduce
 import Memset
 import MonteCarloE
 import MonteCarloPi
+import Myers
 import NibbleSort
 import NIOChannelPipeline
 import NSDictionaryCastToSwift
@@ -243,7 +243,6 @@ registerBenchmark(DictionaryRemove)
 registerBenchmark(DictionarySubscriptDefault)
 registerBenchmark(DictionarySwap)
 registerBenchmark(Diffing)
-registerBenchmark(DiffingMyers)
 registerBenchmark(DropFirst)
 registerBenchmark(DropLast)
 registerBenchmark(DropWhile)
@@ -271,6 +270,7 @@ registerBenchmark(MapReduce)
 registerBenchmark(Memset)
 registerBenchmark(MonteCarloE)
 registerBenchmark(MonteCarloPi)
+registerBenchmark(Myers)
 registerBenchmark(NSDictionaryCastToSwift)
 registerBenchmark(NSErrorTest)
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)

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

@@ -16,7 +16,6 @@
 //===----------------------------------------------------------------------===//
 SWIFT_TYPEID_NAMED(NominalTypeDecl *, NominalTypeDecl)
 SWIFT_TYPEID_NAMED(VarDecl *, VarDecl)
-SWIFT_TYPEID_NAMED(Decl *, Decl)
 SWIFT_TYPEID(Type)
 SWIFT_TYPEID(PropertyWrapperBackingPropertyInfo)
 SWIFT_TYPEID(PropertyWrapperTypeInfo)

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

@@ -17,11 +17,10 @@
 #ifndef SWIFT_AST_BUILTINS_H
 #define SWIFT_AST_BUILTINS_H
 
-#include "swift/AST/Type.h"
-#include "swift/AST/Types.h"
 #include "swift/Basic/LLVM.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/IR/Attributes.h"
+#include "swift/AST/Type.h"
 #include "llvm/IR/Intrinsics.h"
 #include "llvm/Support/ErrorHandling.h"
 
@@ -30,17 +29,9 @@ enum class AtomicOrdering;
 }
 
 namespace swift {
-
-class ASTContext;
-class Identifier;
-class ValueDecl;
-
-enum class BuiltinTypeKind : std::underlying_type<TypeKind>::type {
-#define TYPE(id, parent)
-#define BUILTIN_TYPE(id, parent)                                               \
-  id = std::underlying_type<TypeKind>::type(TypeKind::id),
-#include "swift/AST/TypeNodes.def"
-};
+  class ASTContext;
+  class Identifier;
+  class ValueDecl;
 
 /// Get the builtin type for the given name.
 ///
@@ -98,6 +89,7 @@ llvm::Intrinsic::ID getLLVMIntrinsicID(StringRef Name);
 llvm::Intrinsic::ID
 getLLVMIntrinsicIDForBuiltinWithOverflow(BuiltinValueKind ID);
 
+
 /// Create a ValueDecl for the builtin with the given name.
 ///
 /// Returns null if the name does not identifier a known builtin value.

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

@@ -3451,12 +3451,40 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
   /// Retrieve information about this type as a property wrapper.
   PropertyWrapperTypeInfo getPropertyWrapperTypeInfo() const;
 
+private:
+  /// Predicate used to filter StoredPropertyRange.
+  struct ToStoredProperty {
+    ToStoredProperty() {}
+    Optional<VarDecl *> operator()(Decl *decl) const;
+  };
+  
+public:
+  /// A range for iterating the stored member variables of a structure.
+  using StoredPropertyRange = OptionalTransformRange<DeclRange,
+                                                     ToStoredProperty>;
+
   /// Return a collection of the stored member variables of this type.
-  ArrayRef<VarDecl *> getStoredProperties() const;
+  StoredPropertyRange getStoredProperties() const;
 
+private:
+  /// Predicate used to filter StoredPropertyRange.
+  struct ToStoredPropertyOrMissingMemberPlaceholder {
+    Optional<Decl *> operator()(Decl *decl) const;
+  };
+
+public:
+  /// A range for iterating the stored member variables of a structure.
+  using StoredPropertyOrMissingMemberPlaceholderRange
+    = OptionalTransformRange<DeclRange,
+                             ToStoredPropertyOrMissingMemberPlaceholder>;
+  
   /// Return a collection of the stored member variables of this type, along
   /// with placeholders for unimportable stored properties.
-  ArrayRef<Decl *> getStoredPropertiesAndMissingMemberPlaceholders() const;
+  StoredPropertyOrMissingMemberPlaceholderRange
+  getStoredPropertiesAndMissingMemberPlaceholders() const {
+    return StoredPropertyOrMissingMemberPlaceholderRange(getMembers(),
+                             ToStoredPropertyOrMissingMemberPlaceholder());
+  }
 
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Decl *D) {

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

@@ -350,9 +350,6 @@ ERROR(cannot_convert_default_arg_value,none,
       (Type,Type))
 ERROR(cannot_convert_default_arg_value_protocol,none,
       "default argument value of type %0 does not conform to %1", (Type,Type))
-ERROR(default_argument_literal_cannot_convert, none,
-      "cannot call %0 %1 because default argument of type %2 cannot be "
-      "converted to type %3", (DescriptiveDeclKind, DeclName, Type, Type))
 ERROR(cannot_convert_default_arg_value_nil,none,
       "nil default argument value cannot be converted to type %0", (Type))
 
@@ -3395,12 +3392,9 @@ ERROR(closure_tuple_parameter_destructuring_implicit,none,
 ERROR(nested_tuple_parameter_destructuring,none,
       "nested tuple parameter %0 of function %1 "
       "does not support destructuring", (Type, Type))
-ERROR(single_tuple_parameter_mismatch_special,none,
-      "%0 expects a single parameter of type %1%2",
-      (DescriptiveDeclKind, Type, StringRef))
-ERROR(single_tuple_parameter_mismatch_normal,none,
-      "%0 %1 expects a single parameter of type %2%3",
-      (DescriptiveDeclKind, DeclBaseName, Type, StringRef))
+ERROR(single_tuple_parameter_mismatch,none,
+      "%0 %select{|%1 }3expects a single parameter of type %2",
+      (DescriptiveDeclKind, Identifier, Type, bool))
 ERROR(unknown_single_tuple_parameter_mismatch,none,
       "single parameter of type %0 is expected in call", (Type))