---

yaml
---
r: 317151
b: refs/heads/master-rebranch
c: a8f770f
h: refs/heads/master
i:
  317149: b49a3c0
  317147: c0abad9
  317143: da623bd
  317135: a779587
  317119: 6c56bd8

Author: swift-ci

[refs]

@@ -1457,4 +1457,4 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 8b9a8667004c9333212f467e52f395283192d280
+refs/heads/master-rebranch: a8f770f9ae6de132336d4911b42dadd9091e4bca

branches/master-rebranch/include/swift/Demangling/TypeDecoder.h

@@ -246,10 +246,13 @@ class TypeDecoder {
     case NodeKind::CFunctionPointer:
     case NodeKind::ThinFunctionType:
     case NodeKind::NoEscapeFunctionType:
+    case NodeKind::AutoClosureType:
+    case NodeKind::EscapingAutoClosureType:
     case NodeKind::FunctionType: {
       if (Node->getNumChildren() < 2)
         return BuiltType();
 
+      // FIXME: autoclosure is not represented in function metadata
       FunctionTypeFlags flags;
       if (Node->getKind() == NodeKind::ObjCBlock) {
         flags = flags.withConvention(FunctionMetadataConvention::Block);
@@ -275,7 +278,9 @@ class TypeDecoder {
       flags =
           flags.withNumParameters(parameters.size())
               .withParameterFlags(hasParamFlags)
-              .withEscaping(Node->getKind() == NodeKind::FunctionType);
+              .withEscaping(
+                          Node->getKind() == NodeKind::FunctionType ||
+                          Node->getKind() == NodeKind::EscapingAutoClosureType);
 
       auto result = decodeMangledType(Node->getChild(isThrow ? 2 : 1));
       if (!result) return BuiltType();

branches/master-rebranch/test/IRGen/function_metadata.swift

@@ -53,6 +53,6 @@ func test_arch() {
   arch({(x: inout Int, y: Double, z: String, w: Int8) -> () in })
 
   // CHECK-LABEL: define{{( protected)?}} linkonce_odr hidden swiftcc %swift.metadata_response @"$syyyccMa"
-  // CHECK: call %swift.type* @swift_getFunctionTypeMetadata1(i64 67108865
+  // CHECK: call %swift.type* @swift_getFunctionTypeMetadata1({{i(32|64)}} 67108865
   arch({(x: @escaping () -> ()) -> () in })
 }

branches/master-rebranch/test/Runtime/demangleToMetadata.swift

@@ -45,6 +45,10 @@ func f1_owned(x: __owned AnyObject) { }
 
 func f2_variadic_inout(x: ()..., y: inout ()) { }
 
+func f1_escaping(_: @escaping (Int) -> Float) { }
+func f1_autoclosure(_: @autoclosure () -> Float) { }
+func f1_escaping_autoclosure(_: @autoclosure @escaping () -> Float) { }
+
 DemangleToMetadataTests.test("function types") {
   // Conventions
   expectEqual(type(of: f0), _typeByMangledName("yyc")!)
@@ -77,6 +81,13 @@ DemangleToMetadataTests.test("function types") {
   // A function type that hasn't been built before.
   expectEqual("(Int, Float, Double, String, Character, UInt, Bool) -> ()",
     String(describing: _typeByMangledName("yySi_SfSdSSs9CharacterVSuSbtc")!))
+
+  // Escaping
+  expectEqual(type(of: f1_escaping), _typeByMangledName("ySfSicc")!)
+
+  // Autoclosure
+  expectEqual(type(of: f1_autoclosure), _typeByMangledName("ySfyXKc")!)
+  expectEqual(type(of: f1_escaping_autoclosure), _typeByMangledName("ySfyXAc")!)
 }
 
 DemangleToMetadataTests.test("metatype types") {