---

yaml
---
r: 331775
b: refs/heads/rxwei-patch-1
c: b3ca057
h: refs/heads/master
i:
  331773: 84bab40
  331771: cd0cd59
  331767: 3d6b144
  331759: 1560bed
  331743: aca6efb
  331711: 5ae08a9
  331647: 11ea0ad
  331519: fbb6a46
  331263: 3016ff9
  330751: 015b102
  329727: 1e0a705
  327679: a75c9d3

Author: jrose-apple

[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: 7e8c007757367cc18d04439b302f7790a65daff6
+refs/heads/rxwei-patch-1: b3ca05708d6f00a61a0140eac71f1b4ca245cda3
 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

@@ -56,6 +56,7 @@ set(SWIFT_BENCH_MODULES
     single-source/CharacterProperties
     single-source/Chars
     single-source/ClassArrayGetter
+    single-source/Codable
     single-source/Combos
     single-source/CountAlgo
     single-source/DataBenchmarks
@@ -94,7 +95,6 @@ set(SWIFT_BENCH_MODULES
     single-source/InsertCharacter  
     single-source/Integrate
     single-source/IterateData
-    single-source/JSON
     single-source/Join
     single-source/LazyFilter
     single-source/LinkedList

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

@@ -0,0 +1,146 @@
+//===--- JSON.swift -------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2018 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import TestsUtils
+import Foundation
+
+#if _runtime(_ObjC)
+public let Codable = [
+  BenchmarkInfo(name: "JSONPerfEncode", runFunction: run_JSONPerfEncode, tags: [.validation, .bridging], setUpFunction: setup_json),
+  BenchmarkInfo(name: "JSONPerfDecode", runFunction: run_JSONPerfDecode, tags: [.validation, .bridging], setUpFunction: setup_json),
+  BenchmarkInfo(name: "PlistPerfEncode", runFunction: run_PlistPerfEncode, tags: [.validation, .bridging], setUpFunction: setup_plist),
+  BenchmarkInfo(name: "PlistPerfDecode", runFunction: run_PlistPerfDecode, tags: [.validation, .bridging], setUpFunction: setup_plist),
+]
+#else
+public let Codable = [
+  BenchmarkInfo(name: "JSONPerfEncode", runFunction: run_JSONPerfEncode, tags: [.validation, .bridging], setUpFunction: setup_json),
+  BenchmarkInfo(name: "JSONPerfDecode", runFunction: run_JSONPerfDecode, tags: [.validation, .bridging], setUpFunction: setup_json),
+]
+#endif
+
+
+
+struct Tove: Codable {
+  var slithy: Bool = true
+  var gyreInRadians: Double = 0.3
+}
+
+struct Borogove : Codable {
+  var mimsyness: Int = Int.max
+}
+
+struct Wabe : Codable {
+  var toves: [Tove]
+  var borogoves: [Borogove]?
+  static var canonical: Wabe {
+    return Wabe(toves: [Tove(), Tove(), Tove(), Tove(),
+                        Tove(slithy: false, gyreInRadians: 1.8)],
+                borogoves: [Borogove(mimsyness: 18), Borogove(mimsyness: 74),
+                            Borogove(), Borogove()])
+  }
+}
+
+struct Beast : Codable {
+  var name: String
+}
+
+
+struct Jabberwocky : Codable {
+  var time = "brillig"
+  var wabe = Wabe.canonical
+  var beware: [Beast] = [ Beast(name: "Jabberwock"), Beast(name: "Bandersnatch"), Beast(name: "Jubjub Bird")]
+  var swordType = "vörpal"
+}
+
+protocol GenericEncoder {
+    func encode<T : Encodable>(_ value: T) throws -> Data
+}
+
+protocol GenericDecoder {
+    func decode<T : Decodable>(_ type: T.Type, from data: Data) throws -> T
+}
+
+extension JSONEncoder : GenericEncoder {}
+extension JSONDecoder : GenericDecoder {}
+#if _runtime(_ObjC)
+extension PropertyListEncoder : GenericEncoder {}
+extension PropertyListDecoder : GenericDecoder {}
+#endif
+
+struct CodablePerfTester<Enc: GenericEncoder, Dec: GenericDecoder>  {
+  var poems = Array(repeating: Jabberwocky(), count: 6)
+  var encoder: Enc
+  var decoder: Dec
+  var data: Data! = nil
+  
+  init(encoder e: Enc, decoder d: Dec) {
+    encoder = e
+    decoder = d
+    data = try! encoder.encode(Array(poems.prefix(3)))
+    //pre-warm everything to try to reduce variance
+    let _ = try! encoder.encode(poems)
+    let _ = try! decoder.decode(Array<Jabberwocky>.self,
+                                       from: data)
+  }
+  
+  func encode() {
+    let _ = try! encoder.encode(poems)
+  }
+  
+  func decode() {
+    let _ = try! decoder.decode(Array<Jabberwocky>.self, from: data)
+  }
+}
+
+var JSONTester: CodablePerfTester<JSONEncoder, JSONDecoder>! = nil
+
+public func setup_json() {
+  JSONTester = CodablePerfTester(encoder: JSONEncoder(), decoder: JSONDecoder())
+}
+
+@inline(never)
+public func run_JSONPerfEncode(_ N: Int) {
+  for _ in 0 ..< N {
+    JSONTester.encode()
+  }
+}
+
+@inline(never)
+public func run_JSONPerfDecode(_ N: Int) {
+  for _ in 0 ..< N {
+    JSONTester.decode()
+  }
+}
+
+#if _runtime(_ObjC)
+
+var plistTester: CodablePerfTester<PropertyListEncoder, PropertyListDecoder>! = nil
+
+public func setup_plist() {
+  plistTester = CodablePerfTester(encoder: PropertyListEncoder(), decoder: PropertyListDecoder())
+}
+
+@inline(never)
+public func run_PlistPerfEncode(_ N: Int) {
+  for _ in 0 ..< N {
+    plistTester.encode()
+  }
+}
+
+@inline(never)
+public func run_PlistPerfDecode(_ N: Int) {
+  for _ in 0 ..< N {
+    plistTester.decode()
+  }
+}
+
+#endif

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

@@ -44,6 +44,7 @@ import CharacterLiteralsSmall
 import CharacterProperties
 import Chars
 import ClassArrayGetter
+import Codable
 import Combos
 import CountAlgo
 import DataBenchmarks
@@ -82,7 +83,6 @@ import Histogram
 import InsertCharacter
 import Integrate
 import IterateData
-import JSON
 import Join
 import LazyFilter
 import LinkedList
@@ -255,7 +255,7 @@ registerBenchmark(Histogram)
 registerBenchmark(InsertCharacter)
 registerBenchmark(IntegrateTest)
 registerBenchmark(IterateData)
-registerBenchmark(JSON)
+registerBenchmark(Codable)
 registerBenchmark(Join)
 registerBenchmark(LazyFilter)
 registerBenchmark(LinkedList)

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

@@ -2160,6 +2160,7 @@ function(_add_swift_executable_single name)
         "${SWIFTEXE_SINGLE_LINK_FAT_LIBRARIES}"
         "-${SWIFT_SDK_${SWIFTEXE_SINGLE_SDK}_LIB_SUBDIR}-${SWIFTEXE_SINGLE_ARCHITECTURE}"
         SWIFTEXE_SINGLE_LINK_FAT_LIBRARIES_TARGETS)
+    set(SWIFTEXE_SINGLE_LINK_FAT_LIBRARIES ${SWIFTEXE_SINGLE_LINK_FAT_LIBRARIES_TARGETS})
   endif()
 
   handle_swift_sources(

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

@@ -146,7 +146,8 @@ Globals
   global ::= type protocol-conformance 'WL'   // lazy protocol witness table cache variable
 
   global ::= protocol-conformance identifier 'Wt' // associated type metadata accessor (HISTORICAL)
-  global ::= protocol-conformance assoc-type-list nominal-type 'WT' // associated type witness table accessor
+  global ::= protocol-conformance assoc-type-list protocol 'WT' // associated type witness table accessor
+  global ::= protocol-conformance protocol 'Wb' // base protocol witness table accessor
   global ::= type protocol-conformance 'Wl' // lazy protocol witness table accessor
 
   global ::= type 'WV'                   // value witness table
@@ -200,6 +201,7 @@ types where the metadata itself has unknown layout.)
   global ::= assoc-type-name 'TM'        // default associated type witness accessor (HISTORICAL)
   global ::= type assoc-type-list protocol 'Tn' // associated conformance descriptor
   global ::= type assoc-type-list protocol 'TN' // default associated conformance witness accessor
+  global ::= type protocol 'Tb'          // base conformance descriptor
 
   REABSTRACT-THUNK-TYPE ::= 'R'          // reabstraction thunk helper function
   REABSTRACT-THUNK-TYPE ::= 'r'          // reabstraction thunk

branches/rxwei-patch-1/docs/ABI/Mangling.rst

@@ -845,13 +845,15 @@ struct TargetVTableDescriptorHeader {
 template <typename Runtime>
 struct TargetMethodOverrideDescriptor {
   /// The class containing the base method.
-  TargetRelativeIndirectablePointer<Runtime, TargetClassDescriptor<Runtime>> Class;
+  TargetRelativeIndirectablePointer<Runtime, TargetClassDescriptor<Runtime>,
+                                    /*nullable*/ true> Class;
 
   /// The base method.
-  TargetRelativeIndirectablePointer<Runtime, TargetMethodDescriptor<Runtime>> Method;
+  TargetRelativeIndirectablePointer<Runtime, TargetMethodDescriptor<Runtime>,
+                                    /*nullable*/ true> Method;
 
   /// The implementation of the override.
-  TargetRelativeDirectPointer<Runtime, void, /*Nullable=*/true> Impl;
+  TargetRelativeDirectPointer<Runtime, void, /*nullable*/ true> Impl;
 };
 
 /// Header for a class vtable override descriptor. This is a variable-sized

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

@@ -52,6 +52,7 @@ namespace swift {
   enum class Associativity : unsigned char;
   class BoundGenericType;
   class ClangNode;
+  class ConstructorDecl;
   class Decl;
   class DeclContext;
   class DefaultArgumentInitializer;
@@ -513,8 +514,8 @@ class ASTContext final {
   /// promises to return non-null.
   bool hasArrayLiteralIntrinsics(LazyResolver *resolver) const;
 
-  /// Retrieve the declaration of Swift._getBool.
-  FuncDecl *getGetBoolDecl(LazyResolver *resolver) const;
+  /// Retrieve the declaration of Swift.Bool.init(_builtinBooleanLiteral:)
+  ConstructorDecl *getBoolBuiltinInitDecl() const;
 
   /// Retrieve the declaration of Swift.==(Int, Int) -> Bool.
   FuncDecl *getEqualIntDecl() const;

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

@@ -362,7 +362,7 @@ DECL_ATTR(_clangImporterSynthesizedType, ClangImporterSynthesizedType,
   NotSerialized, 74)
 SIMPLE_DECL_ATTR(_weakLinked, WeakLinked,
   OnNominalType | OnAssociatedType | OnFunc | OnAccessor | OnVar |
-  OnSubscript | OnConstructor | OnEnumElement | UserInaccessible,
+  OnSubscript | OnConstructor | OnEnumElement | OnExtension | UserInaccessible,
   75)
 SIMPLE_DECL_ATTR(_frozen, Frozen,
   OnEnum |

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

@@ -2913,9 +2913,6 @@ class GenericTypeParamDecl : public AbstractTypeParamDecl {
 ///   func getNext() -> Element?
 /// }
 /// \endcode
-///
-/// Every protocol has an implicitly-created associated type 'Self' that
-/// describes a type that conforms to the protocol.
 class AssociatedTypeDecl : public AbstractTypeParamDecl {
   /// The location of the initial keyword.
   SourceLoc KeywordLoc;
@@ -3875,6 +3872,14 @@ struct SelfReferenceKind {
 ///   protocol Drawable {
 ///     func draw()
 ///   }
+///
+/// Every protocol has an implicitly-created 'Self' generic parameter that
+/// stands for a type that conforms to the protocol. For example,
+///
+///   protocol Cloneable {
+///     func clone() -> Self
+///   }
+///
 class ProtocolDecl final : public NominalTypeDecl {
   SourceLoc ProtocolLoc;
 

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

@@ -1349,6 +1349,8 @@ ERROR(attr_availability_unavailable_deprecated,none,
       "'%0' attribute cannot be both unconditionally 'unavailable' and "
       "'deprecated'", (StringRef))
 
+WARNING(attr_availability_invalid_duplicate,none,
+        "'%0' argument has already been specified", (StringRef))
 WARNING(attr_availability_unknown_platform,none,
       "unknown platform '%0' for attribute '%1'", (StringRef, StringRef))
 ERROR(attr_availability_invalid_renamed,none,