---

LucianoPAlmeida · LucianoPAlmeida · commit 1b8238cdb2a7 · 2019-09-07T15:07:59.000-03:00
yaml --- r: 343719 b: refs/heads/master-rebranch c: 940b0ba h: refs/heads/master i: 343717: a0fa48b 343715: c49fd24 343711: 1432671
diff --git a/[refs] b/[refs]
@@ -1455,7 +1455,7 @@ 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: 28d3c6c668dd7d70a60d5a4e6e3dbdbd6033cfed
+refs/heads/master-rebranch: 940b0bad23de7c31ef4fbabe370fad353b3f635a
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
diff --git a/branches/master-rebranch/lib/Sema/TypeCheckType.cpp b/branches/master-rebranch/lib/Sema/TypeCheckType.cpp
@@ -2265,7 +2265,7 @@ Type TypeResolver::resolveAttributedType(TypeAttributes &attrs,
               diagnose(attrs.getLoc(TAK_convention),
                        diag::invalid_autoclosure_and_convention_attributes,
                        attrs.getConvention());
-              attrs.clearAttribute(TAK_autoclosure);
+              attrs.clearAttribute(TAK_convention);
             }
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -2265,7 +2265,7 @@ Type TypeResolver::resolveAttributedType(TypeAttributes &attrs,`
`2265`	`2265`	`diagnose(attrs.getLoc(TAK_convention),`
`2266`	`2266`	`diag::invalid_autoclosure_and_convention_attributes,`
`2267`	`2267`	`attrs.getConvention());`
`2268`		`- attrs.clearAttribute(TAK_autoclosure);`
	`2268`	`+ attrs.clearAttribute(TAK_convention);`
`2269`	`2269`	`}`
`2270`	`2270`	`}`
`2271`	`2271`	`}`