---

yaml
---
r: 348722
b: refs/heads/master
c: e7e45fd
h: refs/heads/master

Author: rintaro

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: dc3f110f608c87dcce4f8d3a3f9e52bdc9001dad
+refs/heads/master: e7e45fd311607b896efeb4cddf0fa29f1ccde452
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Parse/ParseType.cpp

@@ -1084,22 +1084,28 @@ ParsedSyntaxResult<ParsedTypeSyntax> Parser::parseTypeTupleBody() {
       return ty.getStatus();
     }
 
-    if (IsInOutObsoleted) {
-      bool IsTypeAlreadyAttributed = false;
-      if (auto AttributedType = ty.getAs<ParsedAttributedTypeSyntax>()) {
-        IsTypeAlreadyAttributed =
-            AttributedType->getDeferredSpecifier().hasValue();
-        ty = makeParsedResult(std::move(*AttributedType), ty.getStatus());
-      }
-
-      if (IsTypeAlreadyAttributed) {
-        // If the parsed type is already attributed, suggest removing `inout`.
-        diagnose(Tok, diag::parameter_specifier_repeated)
-            .fixItRemove(InOutLoc);
+    if (InOut) {
+      if (IsInOutObsoleted) {
+        bool IsTypeAlreadyAttributed = false;
+        if (auto AttributedType = ty.getAs<ParsedAttributedTypeSyntax>()) {
+          IsTypeAlreadyAttributed =
+              AttributedType->getDeferredSpecifier().hasValue();
+          ty = makeParsedResult(std::move(*AttributedType), ty.getStatus());
+        }
+        if (IsTypeAlreadyAttributed) {
+          // If the parsed type is already attributed, suggest removing `inout`.
+          diagnose(Tok, diag::parameter_specifier_repeated)
+              .fixItRemove(InOutLoc);
+        } else {
+          diagnose(InOutLoc, diag::parameter_specifier_as_attr_disallowed, "inout")
+              .fixItRemove(InOutLoc)
+              .fixItInsert(TypeLoc, "inout ");
+        }
       } else {
-        diagnose(InOutLoc, diag::parameter_specifier_as_attr_disallowed, "inout")
-            .fixItRemove(InOutLoc)
-            .fixItInsert(TypeLoc, "inout ");
+        // Apply 'inout' to the parsed type.
+        ParsedAttributedTypeSyntaxBuilder builder(*SyntaxContext);
+        ty = applyAttributeToTypeSyntax(std::move(ty), std::move(InOut), None);
+        InOut.reset();
       }
     }
 

trunk/test/Syntax/Outputs/round_trip_parse_gen.swift.withkinds

@@ -142,7 +142,10 @@ typealias G <TypeInitializerClause>= <FunctionType>(<TupleTypeElement>a x: <Simp
 typealias H <TypeInitializerClause>= <FunctionType>() rethrows -> <TupleType>()</TupleType></FunctionType></TypeInitializerClause></TypealiasDecl><TypealiasDecl>
 typealias I <TypeInitializerClause>= <FunctionType>(<TupleTypeElement><CompositionType><CompositionTypeElement><SimpleTypeIdentifier>A </SimpleTypeIdentifier>& </CompositionTypeElement><CompositionTypeElement><SimpleTypeIdentifier>B<GenericArgumentClause><<GenericArgument><SimpleTypeIdentifier>C</SimpleTypeIdentifier></GenericArgument>></GenericArgumentClause></SimpleTypeIdentifier></CompositionTypeElement></CompositionType></TupleTypeElement>) -> <CompositionType><CompositionTypeElement><SimpleTypeIdentifier>C </SimpleTypeIdentifier>& </CompositionTypeElement><CompositionTypeElement><SimpleTypeIdentifier>D</SimpleTypeIdentifier></CompositionTypeElement></CompositionType></FunctionType></TypeInitializerClause></TypealiasDecl><TypealiasDecl>
 typealias J <TypeInitializerClause>= <AttributedType>inout <Attribute>@autoclosure </Attribute><FunctionType>() -> <SimpleTypeIdentifier>Int</SimpleTypeIdentifier></FunctionType></AttributedType></TypeInitializerClause></TypealiasDecl><TypealiasDecl>
-typealias K <TypeInitializerClause>= <FunctionType>(<TupleTypeElement><AttributedType><Attribute>@invalidAttr </Attribute><SimpleTypeIdentifier>Int</SimpleTypeIdentifier></AttributedType>, </TupleTypeElement><TupleTypeElement>inout <SimpleTypeIdentifier>Int</SimpleTypeIdentifier>, </TupleTypeElement><TupleTypeElement><AttributedType>__shared <SimpleTypeIdentifier>Int</SimpleTypeIdentifier></AttributedType>, </TupleTypeElement><TupleTypeElement><AttributedType>__owned <SimpleTypeIdentifier>Int</SimpleTypeIdentifier></AttributedType></TupleTypeElement>) -> <TupleType>()</TupleType></FunctionType></TypeInitializerClause></TypealiasDecl><TypealiasDecl><Attribute>
+typealias K <TypeInitializerClause>= <FunctionType>(<TupleTypeElement><AttributedType><Attribute>@invalidAttr </Attribute><SimpleTypeIdentifier>Int</SimpleTypeIdentifier></AttributedType>, </TupleTypeElement><TupleTypeElement><AttributedType>inout <SimpleTypeIdentifier>Int</SimpleTypeIdentifier></AttributedType>, </TupleTypeElement><TupleTypeElement><AttributedType>__shared <SimpleTypeIdentifier>Int</SimpleTypeIdentifier></AttributedType>, </TupleTypeElement><TupleTypeElement><AttributedType>__owned <SimpleTypeIdentifier>Int</SimpleTypeIdentifier></AttributedType></TupleTypeElement>) -> <TupleType>()</TupleType></FunctionType></TypeInitializerClause></TypealiasDecl><TypealiasDecl>
+typealias L <TypeInitializerClause>= <FunctionType>(<TupleTypeElement><AttributedType>inout <SimpleTypeIdentifier>Int</SimpleTypeIdentifier></AttributedType></TupleTypeElement>) -> <SimpleTypeIdentifier>Int</SimpleTypeIdentifier></FunctionType></TypeInitializerClause></TypealiasDecl><TypealiasDecl>
+typealias M <TypeInitializerClause>= <FunctionType>(<TupleTypeElement>inout arg: <SimpleTypeIdentifier>Int</SimpleTypeIdentifier></TupleTypeElement>) -> <SimpleTypeIdentifier>Int</SimpleTypeIdentifier></FunctionType></TypeInitializerClause></TypealiasDecl><TypealiasDecl>
+typealias N <TypeInitializerClause>= <FunctionType>(<TupleTypeElement>inout _ arg: <AttributedType><Attribute>@objc </Attribute><SimpleTypeIdentifier>Int</SimpleTypeIdentifier></AttributedType></TupleTypeElement>) -> <SimpleTypeIdentifier>Int</SimpleTypeIdentifier></FunctionType></TypeInitializerClause></TypealiasDecl><TypealiasDecl><Attribute>
 
 @objc </Attribute><DeclModifier>private </DeclModifier>typealias T<GenericParameterClause><<GenericParameter>a,</GenericParameter><GenericParameter>b</GenericParameter>> </GenericParameterClause><TypeInitializerClause>= <SimpleTypeIdentifier>Int</SimpleTypeIdentifier></TypeInitializerClause></TypealiasDecl><TypealiasDecl><Attribute>
 @objc </Attribute><DeclModifier>private </DeclModifier>typealias T<GenericParameterClause><<GenericParameter>a,</GenericParameter><GenericParameter>b</GenericParameter>></GenericParameterClause></TypealiasDecl><ClassDecl>

trunk/test/Syntax/round_trip_parse_gen.swift

@@ -143,6 +143,9 @@ typealias H = () rethrows -> ()
 typealias I = (A & B<C>) -> C & D
 typealias J = inout @autoclosure () -> Int
 typealias K = (@invalidAttr Int, inout Int, __shared Int, __owned Int) -> ()
+typealias L = (inout Int) -> Int
+typealias M = (inout arg: Int) -> Int
+typealias N = (inout _ arg: @objc Int) -> Int
 
 @objc private typealias T<a,b> = Int
 @objc private typealias T<a,b>