---

yaml
---
r: 341237
b: refs/heads/rxwei-patch-1
c: 9c044fe
h: refs/heads/master
i:
  341235: 3d13f83

Author: rintaro

[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: 4513859ae206256980ccfd0e637d5e3aa5583a08
+refs/heads/rxwei-patch-1: 9c044fe1070447debb143bfa176af3ab1f1941f8
 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/single-source/ObjectiveCBridging.swift

@@ -76,9 +76,6 @@ public let ObjectiveCBridging = [
   BenchmarkInfo(name: "ObjectiveCBridgeASCIIStringFromFile",
                 runFunction: run_ASCIIStringFromFile, tags: ts,
                 setUpFunction: setup_ASCIIStringFromFile),
-  BenchmarkInfo(name: "UnicodeStringFromCodable",
-                 runFunction: run_UnicodeStringFromCodable, tags: ts,
-                 setUpFunction: setup_UnicodeStringFromCodable),
 ]
 
 #if _runtime(_ObjC)
@@ -747,29 +744,3 @@ public func run_ASCIIStringFromFile(_ N: Int) {
   #endif
 }
 
-var unicodeStringFromCodable:String? = nil
-var unicodeStringFromCodableDict = [String:Void]()
-public func setup_UnicodeStringFromCodable() {
-  do {
-    let jsonString = "[\(String(reflecting: "Nice string which works rather slöw."))]"
-    
-    let decoded = try JSONDecoder().decode([String].self, from: Data(jsonString.utf8))
-    let reEncoded = try JSONEncoder().encode(decoded)
-    let desc = try JSONDecoder().decode([String].self, from: reEncoded)
-    
-    unicodeStringFromCodable = desc[0]
-  } catch (_) {
-    
-  }
-}
-
-@inline(never)
-public func run_UnicodeStringFromCodable(_ N: Int) {
-  #if _runtime(_ObjC)
-  for _ in 0 ..< N {
-    for _ in 0..<100 {
-      unicodeStringFromCodableDict[identity(unicodeStringFromCodable!)] = ()
-    }
-  }
-  #endif
-}

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

@@ -87,7 +87,7 @@ class ASTBuilder {
   Type createBoundGenericType(GenericTypeDecl *decl, ArrayRef<Type> args);
 
   Type resolveOpaqueType(NodePointer opaqueDescriptor,
-                         ArrayRef<ArrayRef<Type>> args,
+                         ArrayRef<Type> args,
                          unsigned ordinal);
 
   Type createBoundGenericType(GenericTypeDecl *decl, ArrayRef<Type> args,

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

@@ -36,7 +36,6 @@ namespace swift {
   class ValueDecl;
   class SourceLoc;
   enum class tok;
-  enum class AccessorKind;
 
 /// Describes the context in which a name is being printed, which
 /// affects the keywords that need to be escaped.
@@ -340,7 +339,6 @@ void printEnumElementsAsCases(
 void getInheritedForPrinting(const Decl *decl, const PrintOptions &options,
                              llvm::SmallVectorImpl<TypeLoc> &Results);
 
-StringRef getAccessorKindString(AccessorKind value);
 } // namespace swift
 
 #endif // LLVM_SWIFT_AST_ASTPRINTER_H