Remove the #setline directive, which was formerly known as #line and is now

known as #sourceLocation.  #setline was an intermediate but never endorsed state.

Upgrade the migration diagnostics for SE-0066 and SE-0049 to be errors instead of warnings.

Author: lattner

include/swift/AST/DiagnosticsSema.def

@@ -828,7 +828,7 @@ ERROR(missing_initializer_def,PointsToFirstBadToken,
       "initializer requires a body", ())
 
 // Attributes
-WARNING(attr_decl_attr_now_on_type,none,
+ERROR(attr_decl_attr_now_on_type,none,
       "%0 is now an attribute on a parameter type, "
       "instead of on the parameter itself", (StringRef))
 
@@ -2669,8 +2669,8 @@ ERROR(objc_invalid_with_generic_params,none,
 ERROR(objc_convention_invalid,none,
       "%0 is not representable in Objective-C, so it cannot be used"
       " with '@convention(%1)'", (Type, StringRef))
-WARNING(function_type_no_parens,none,
-        "single argument function types require parentheses", ())
+ERROR(function_type_no_parens,none,
+      "single argument function types require parentheses", ())
 NOTE(not_objc_empty_protocol_composition,none,
      "'protocol<>' is not considered '@objc'; use 'AnyObject' instead", ())
 NOTE(not_objc_protocol,none,

include/swift/Parse/Parser.h

@@ -708,8 +708,8 @@ class Parser {
                                                  DeclAttributes &Attributes);
 
   ParserResult<IfConfigDecl> parseDeclIfConfig(ParseDeclOptions Flags);
-  /// Parse a #line/#setline directive.
-  /// 'isLine = true' indicates parsing #line instead of #setline
+  /// Parse a #line/#sourceLocation directive.
+  /// 'isLine = true' indicates parsing #line instead of #sourcelocation
   ParserStatus parseLineDirective(bool isLine = false);
 
   void setLocalDiscriminator(ValueDecl *D);

include/swift/Parse/Tokens.def

@@ -190,7 +190,6 @@ POUND_KEYWORD(elseif)
 POUND_KEYWORD(endif)
 POUND_KEYWORD(keyPath)
 POUND_KEYWORD(line)
-POUND_KEYWORD(setline)
 POUND_KEYWORD(sourceLocation)
 POUND_KEYWORD(selector)
 

lib/Parse/ParseDecl.cpp

@@ -1736,7 +1736,6 @@ static bool isKeywordPossibleDeclStart(const Token &Tok) {
   case tok::kw_var:
   case tok::pound_if:
   case tok::identifier:
-  case tok::pound_setline:
   case tok::pound_sourceLocation:
     return true;
   case tok::pound_line:
@@ -2158,7 +2157,6 @@ ParserStatus Parser::parseDecl(ParseDeclOptions Flags,
       Status = parseLineDirective(false);
       break;
     case tok::pound_line:
-    case tok::pound_setline:
       Status = parseLineDirective(true);
       break;
 

lib/Parse/ParseStmt.cpp

@@ -47,7 +47,6 @@ bool Parser::isStartOfStmt() {
   case tok::kw_case:
   case tok::kw_default:
   case tok::pound_if:
-  case tok::pound_setline:
   case tok::pound_sourceLocation:
     return true;
 
@@ -292,8 +291,7 @@ ParserStatus Parser::parseBraceItems(SmallVectorImpl<ASTNode> &Entries,
     // Parse the decl, stmt, or expression.
     PreviousHadSemi = false;
     if (isStartOfDecl()
-        && Tok.isNot(tok::pound_if, tok::pound_setline,
-                     tok::pound_sourceLocation)) {
+        && Tok.isNot(tok::pound_if, tok::pound_sourceLocation)) {
       ParserStatus Status =
           parseDecl(IsTopLevel ? PD_AllowTopLevel : PD_Default,
                     [&](Decl *D) {TmpDecls.push_back(D);});
@@ -347,7 +345,7 @@ ParserStatus Parser::parseBraceItems(SmallVectorImpl<ASTNode> &Entries,
         Entries.push_back(Entry);
       }
 
-    } else if (Tok.isAny(tok::pound_line, tok::pound_setline)) {
+    } else if (Tok.is(tok::pound_line)) {
       ParserStatus Status = parseLineDirective(true);
       BraceItemsStatus |= Status;
       NeedParseErrorRecovery = Status.isError();
@@ -570,7 +568,6 @@ ParserResult<Stmt> Parser::parseStmt() {
     if (tryLoc.isValid()) diagnose(tryLoc, diag::try_on_stmt, Tok.getText());
     return parseStmtIfConfig();
   case tok::pound_line:
-  case tok::pound_setline:
     if (LabelInfo) diagnose(LabelInfo.Loc, diag::invalid_label_on_stmt);
     if (tryLoc.isValid()) diagnose(tryLoc, diag::try_on_stmt, Tok.getText());
     return parseLineDirective(true);

test/Parse/line-directive.swift

@@ -31,6 +31,3 @@ public struct S { // expected-note{{in declaration of 'S'}}
 
 #sourceLocation()
 
-
-// expected-error@+1{{#line directive was renamed to #sourceLocation}}
-#setline 32000 "troops_on_the_water"

test/attr/attr_autoclosure.swift

@@ -68,7 +68,7 @@ struct AutoclosureEscapeTest {
 }
 
 // @autoclosure(escaping)
-// expected-warning @+1 {{@autoclosure is now an attribute on a parameter type, instead of on the parameter itself}} {{13-34=}} {{38-38=@autoclosure(escaping) }}
+// expected-error @+1 {{@autoclosure is now an attribute on a parameter type, instead of on the parameter itself}} {{13-34=}} {{38-38=@autoclosure(escaping) }}
 func func10(@autoclosure(escaping _: () -> ()) { } // expected-error{{expected ')' in @autoclosure}}
 // expected-note@-1{{to match this opening '('}}
 
@@ -123,9 +123,9 @@ let _ : (@autoclosure(escaping) -> ()) -> ()  // expected-error {{use of undecla
 
 
 // Migration
-// expected-warning @+1 {{@autoclosure is now an attribute on a parameter type, instead of on the parameter itself}} {{16-28=}} {{32-32=@autoclosure }}
+// expected-error @+1 {{@autoclosure is now an attribute on a parameter type, instead of on the parameter itself}} {{16-28=}} {{32-32=@autoclosure }}
 func migrateAC(@autoclosure _: () -> ()) { }
 
-// expected-warning @+1 {{@autoclosure is now an attribute on a parameter type, instead of on the parameter itself}} {{17-39=}} {{43-43=@autoclosure(escaping) }}
+// expected-error @+1 {{@autoclosure is now an attribute on a parameter type, instead of on the parameter itself}} {{17-39=}} {{43-43=@autoclosure(escaping) }}
 func migrateACE(@autoclosure(escaping) _: () -> ()) { }
 

test/attr/attr_noescape.swift

@@ -296,10 +296,10 @@ enum r19997577Type {
 }
 
 // type attribute and decl attribute
-func noescapeD(@noescape f: () -> Bool) {} // expected-warning {{@noescape is now an attribute on a parameter type, instead of on the parameter itself}} {{16-25=}} {{29-29=@noescape }}
+func noescapeD(@noescape f: () -> Bool) {} // expected-error {{@noescape is now an attribute on a parameter type, instead of on the parameter itself}} {{16-25=}} {{29-29=@noescape }}
 func noescapeT(f: @noescape () -> Bool) {} // ok
-func autoclosureD(@autoclosure f: () -> Bool) {} // expected-warning {{@autoclosure is now an attribute on a parameter type, instead of on the parameter itself}} {{19-31=}} {{35-35=@autoclosure }}
+func autoclosureD(@autoclosure f: () -> Bool) {} // expected-error {{@autoclosure is now an attribute on a parameter type, instead of on the parameter itself}} {{19-31=}} {{35-35=@autoclosure }}
 func autoclosureT(f: @autoclosure () -> Bool) {}  // ok
 
 func noescapeD_noescapeT(@noescape f: @noescape () -> Bool) {}
-func autoclosureD_noescapeT(@autoclosure f: @noescape () -> Bool) {} // expected-warning {{@autoclosure is now an attribute on a parameter type, instead of on the parameter itself}} {{29-41=}} {{45-45=@autoclosure }}
+func autoclosureD_noescapeT(@autoclosure f: @noescape () -> Bool) {} // expected-error {{@autoclosure is now an attribute on a parameter type, instead of on the parameter itself}} {{29-41=}} {{45-45=@autoclosure }}

test/type/types.swift

@@ -157,7 +157,7 @@ class r21949448 {
 }
 
 // SE-0066 - Standardize function type argument syntax to require parentheses
-let _ : Int -> Float // expected-warning {{single argument function types require parentheses}} {{9-9=(}} {{12-12=)}}
+let _ : Int -> Float // expected-error {{single argument function types require parentheses}} {{9-9=(}} {{12-12=)}}