[noescape by default] Incorporate Slav's feedback

Author: milseman

CHANGELOG.md

@@ -6,9 +6,9 @@ Swift 3.0
 * [SE-103](https://github.com/apple/swift-evolution/blob/master/proposals/0103-make-noescape-default.md)
 
   Closure parameters are non-escaping by default, rather than explicitly being
-  annotated @noescape. Use @escaping to say that a closure parameter may escape.
-  @autoclosure(escaping) is now spelled @autoclosure @escaping. @noescape and
-  @autoclosure(escaping) are deprecated.
+  annotated `@noescape`. Use `@escaping` to say that a closure parameter may
+  escape. `@autoclosure(escaping)` is now spelled `@autoclosure @escaping`.
+  `@noescape` and `@autoclosure(escaping)` are deprecated.
 
 * [SE-0115](https://github.com/apple/swift-evolution/blob/master/proposals/0115-literal-syntax-protocols.md)
 

include/swift/AST/Attr.h

@@ -52,9 +52,6 @@ class TypeAttributes {
   SourceLoc AtLoc;
   Optional<StringRef> convention = None;
 
-  /// For the deprecated @autoclosure(escaping) syntax
-  bool isDeprecatedAutoclosureEscaping = false;
-
   // For an opened existential type, the known ID.
   Optional<UUID> OpenedID;
 

lib/AST/ASTPrinter.cpp

@@ -3742,16 +3742,11 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
   void printFunctionExtInfo(AnyFunctionType::ExtInfo info) {
     if (Options.SkipAttributes)
       return;
-    if (info.isAutoClosure()) {
-      if (info.isNoEscape())
-        Printer << "@autoclosure ";
-      else
-        Printer << "@autoclosure @escaping ";
-    } else if (inParameterPrinting) {
-      if (!info.isNoEscape()) {
-        Printer << "@escaping ";
-      }
-    }
+
+    if (info.isAutoClosure())
+      Printer << "@autoclosure ";
+    if (inParameterPrinting && !info.isNoEscape())
+      Printer << "@escaping ";
 
     if (Options.PrintFunctionRepresentationAttrs) {
       // TODO: coalesce into a single convention attribute.

lib/AST/TypeRepr.cpp

@@ -276,13 +276,8 @@ void AttributedTypeRepr::printAttrs(llvm::raw_ostream &OS) const {
 void AttributedTypeRepr::printAttrs(ASTPrinter &Printer) const {
   const TypeAttributes &Attrs = getAttrs();
 
-  if (Attrs.isDeprecatedAutoclosureEscaping) {
-    // Deprecated:
-    Printer << "@autoclosure(escaping) ";
-  } else {
-    if (Attrs.has(TAK_autoclosure)) Printer << "@autoclosure ";
-    if (Attrs.has(TAK_escaping))    Printer << "@escaping ";
-  }
+  if (Attrs.has(TAK_autoclosure)) Printer << "@autoclosure ";
+  if (Attrs.has(TAK_escaping))    Printer << "@escaping ";
 
   if (Attrs.has(TAK_thin))         Printer << "@thin ";
   if (Attrs.has(TAK_thick))        Printer << "@thick ";

lib/Parse/ParseDecl.cpp

@@ -1512,8 +1512,6 @@ bool Parser::parseTypeAttribute(TypeAttributes &Attributes, bool justChecking) {
   case TAK_autoclosure:
     // Handle @autoclosure(escaping)
     if (isAutoclosureEscaping) {
-      Attributes.isDeprecatedAutoclosureEscaping = true;
-
       // @noescape @autoclosure(escaping) makes no sense.
       if (Attributes.has(TAK_noescape)) {
         diagnose(Loc, diag::attr_noescape_conflicts_escaping_autoclosure);
@@ -1522,27 +1520,24 @@ bool Parser::parseTypeAttribute(TypeAttributes &Attributes, bool justChecking) {
             .fixItReplace({Loc, autoclosureEscapingRightParenLoc},
                           "@autoclosure @escaping ");
       }
+      Attributes.setAttr(TAK_escaping, Loc);
     } else if (Attributes.has(TAK_noescape)) {
       diagnose(Loc, diag::attr_noescape_implied_by_autoclosure);
     }
     break;
 
   case TAK_noescape:
-    // You can't specify @noescape and @autoclosure(escaping) together, and
-    // @noescape after @autoclosure is redundant.
-    if (Attributes.has(TAK_autoclosure) &&
-        Attributes.isDeprecatedAutoclosureEscaping) {
-      diagnose(Loc, diag::attr_noescape_conflicts_escaping_autoclosure);
-      return false;
-    } else if (Attributes.has(TAK_autoclosure)) {
-      diagnose(Loc, diag::attr_noescape_implied_by_autoclosure);
-    }
     // You can't specify @noescape and @escaping together.
     if (Attributes.has(TAK_escaping)) {
       diagnose(Loc, diag::attr_escaping_conflicts_noescape);
       return false;
     }
 
+    // @noescape after @autoclosure is redundant.
+    if (Attributes.has(TAK_autoclosure)) {
+      diagnose(Loc, diag::attr_noescape_implied_by_autoclosure);
+    }
+
     // @noescape is deprecated and no longer used
     diagnose(Loc, diag::attr_noescape_deprecated)
       .fixItRemove({Attributes.AtLoc,Loc});

lib/Sema/TypeCheckType.cpp

@@ -1889,8 +1889,7 @@ Type TypeResolver::resolveAttributedType(TypeAttributes &attrs,
     }
 
     bool defaultNoEscape = false;
-    if (isFunctionParam && !attrs.has(TAK_escaping) &&
-        !attrs.isDeprecatedAutoclosureEscaping) {
+    if (isFunctionParam && !attrs.has(TAK_escaping)) {
       defaultNoEscape = isDefaultNoEscapeContext(DC);
     }
 

test/attr/attr_autoclosure.swift

@@ -74,7 +74,7 @@ struct AutoclosureEscapeTest {
 func func10(@autoclosure(escaping _: () -> ()) { } // expected-error{{expected ')' in @autoclosure}}
 // expected-note@-1{{to match this opening '('}}
 
-func func11(_: @autoclosure(escaping) @noescape () -> ()) { } // expected-error{{@noescape conflicts with @autoclosure(escaping)}}
+func func11(_: @autoclosure(escaping) @noescape () -> ()) { } // expected-error{{@escaping conflicts with @noescape}}
   // expected-warning@-1{{@autoclosure(escaping) is deprecated; use @autoclosure @escaping instead}} {{17-38=@autoclosure @escaping }}
 
 class Super {

test/decl/overload.swift

@@ -226,9 +226,9 @@ func throwsFunc(code: Int) throws { } // expected-error{{invalid redeclaration o
 func throwsFuncParam(_ fn: () throws -> ()) { }
 func throwsFuncParam(_ fn: () -> ()) { }
 
-// @noescape
-func noescape(x: (Int) -> Int) { } // expected-note{{previously declared}}
-func noescape(x: (Int) -> Int) { } // expected-error{{invalid redeclaration of 'noescape(x:)'}}
+// @escaping
+func escaping(x: @escaping (Int) -> Int) { } // expected-note{{previously declared}}
+func escaping(x: (Int) -> Int) { } // expected-error{{invalid redeclaration of 'escaping(x:)'}}
 
 // @autoclosure
 func autoclosure(f: () -> Int) { }