Mark tuple splat and ++/-- as errors instead of warnings. This

lattner · lattner · commit 8e12008d2b34 · 2016-04-16T23:44:22.000-07:00
wraps up SE-0004 and SE-0029. I consider the diagnostic changes in Constraints/lvalues.swift to be indicative of a QoI regression, but I'll deal with that separately.
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -2059,8 +2059,8 @@ WARNING(store_in_willset,none,
         "attempting to store to property %0 within its own willSet, which is "
         "about to be overwritten by the new value", (Identifier))
 
-WARNING(tuple_splat_use,none,
-        "passing %0 arguments to a callee as a single tuple value is deprecated",
+ERROR(tuple_splat_use,none,
+      "passing %0 arguments to a callee as a single tuple value has been removed in Swift 3",
         (unsigned))
 
 
diff --git a/lib/Sema/CSDiag.cpp b/lib/Sema/CSDiag.cpp
@@ -4209,9 +4209,9 @@ bool FailureDiagnosis::visitApplyExpr(ApplyExpr *callExpr) {
   // Get the expression result of type checking the arguments to the call
   // independently, so we have some idea of what we're working with.
   //
-  auto argExpr = typeCheckArgumentChildIndependently(callExpr->getArg(), argType,
-                                                     calleeInfo,
-                                                     TCC_AllowUnresolvedTypeVariables);
+  auto argExpr = typeCheckArgumentChildIndependently(callExpr->getArg(),
+                                                     argType, calleeInfo,
+                                             TCC_AllowUnresolvedTypeVariables);
   if (!argExpr)
     return true; // already diagnosed.
 
diff --git a/lib/Sema/MiscDiagnostics.cpp b/lib/Sema/MiscDiagnostics.cpp
@@ -973,8 +973,8 @@ class AvailabilityWalker : public ASTWalker {
 
 private:
   bool diagAvailability(const ValueDecl *D, SourceRange R);
-  bool diagnoseIncDecDeprecation(const ValueDecl *D, SourceRange R,
-                                 const AvailableAttr *Attr);
+  bool diagnoseIncDecRemoval(const ValueDecl *D, SourceRange R,
+                             const AvailableAttr *Attr);
 
   /// Walk an assignment expression, checking for availability.
   void walkAssignExpr(AssignExpr *E) {
@@ -1090,13 +1090,16 @@ bool AvailabilityWalker::diagAvailability(const ValueDecl *D, SourceRange R) {
   if (!D)
     return false;
 
+  if (auto *attr = AvailableAttr::isUnavailable(D))
+    if (diagnoseIncDecRemoval(D, R, attr))
+      return true;
+
   if (TC.diagnoseExplicitUnavailability(D, R, DC))
     return true;
 
   // Diagnose for deprecation
   if (const AvailableAttr *Attr = TypeChecker::getDeprecated(D)) {
-    if (!diagnoseIncDecDeprecation(D, R, Attr))
-      TC.diagnoseDeprecated(R, DC, Attr, D->getFullName());
+    TC.diagnoseDeprecated(R, DC, Attr, D->getFullName());
   }
 
   if (TC.getLangOpts().DisableAvailabilityChecking)
@@ -1132,11 +1135,11 @@ static bool isIntegerOrFloatingPointType(Type ty, DeclContext *DC,
 }
 
 
-/// If this is a call to a deprecated ++ / -- operator, try to diagnose it with
-/// a fixit hint and return true.  If not, or if we fail, return false.
-bool AvailabilityWalker::diagnoseIncDecDeprecation(const ValueDecl *D,
-                                                   SourceRange R,
-                                                   const AvailableAttr *Attr) {
+/// If this is a call to an unavailable ++ / -- operator, try to diagnose it
+/// with a fixit hint and return true.  If not, or if we fail, return false.
+bool AvailabilityWalker::diagnoseIncDecRemoval(const ValueDecl *D,
+                                               SourceRange R,
+                                               const AvailableAttr *Attr) {
   // We can only produce a fixit if we're talking about ++ or --.
   bool isInc = D->getNameStr() == "++";
   if (!isInc && D->getNameStr() != "--")
@@ -1171,17 +1174,16 @@ bool AvailabilityWalker::diagnoseIncDecDeprecation(const ValueDecl *D,
   
   if (!replacement.empty()) {
     // If we emit a deprecation diagnostic, produce a fixit hint as well.
-    TC.diagnoseDeprecated(R, DC, Attr, D->getFullName(),
-                          [&](InFlightDiagnostic &diag) {
-      if (isa<PrefixUnaryExpr>(call)) {
-        // Prefix: remove the ++ or --.
-        diag.fixItRemove(call->getFn()->getSourceRange());
-        diag.fixItInsertAfter(call->getArg()->getEndLoc(), replacement);
-      } else {
-        // Postfix: replace the ++ or --.
-        diag.fixItReplace(call->getFn()->getSourceRange(), replacement);
-      }
-    });
+    auto diag = TC.diagnose(R.Start, diag::availability_decl_unavailable_msg,
+                            D->getFullName(), "it has been removed in Swift 3");
+    if (isa<PrefixUnaryExpr>(call)) {
+      // Prefix: remove the ++ or --.
+      diag.fixItRemove(call->getFn()->getSourceRange());
+      diag.fixItInsertAfter(call->getArg()->getEndLoc(), replacement);
+    } else {
+      // Postfix: replace the ++ or --.
+      diag.fixItReplace(call->getFn()->getSourceRange(), replacement);
+    }
 
     return true;
   }
diff --git a/lib/Sema/TypeChecker.cpp b/lib/Sema/TypeChecker.cpp
@@ -2244,8 +2244,7 @@ static bool isInsideDeprecatedDeclaration(SourceRange ReferenceRange,
 void TypeChecker::diagnoseDeprecated(SourceRange ReferenceRange,
                                      const DeclContext *ReferenceDC,
                                      const AvailableAttr *Attr,
-                                     DeclName Name,
-                   std::function<void(InFlightDiagnostic&)> extraInfoHandler) {
+                                     DeclName Name) {
   // We match the behavior of clang to not report deprecation warnings
   // inside declarations that are themselves deprecated on all deployment
   // targets.
@@ -2270,30 +2269,24 @@ void TypeChecker::diagnoseDeprecated(SourceRange ReferenceRange,
     DeprecatedVersion = Attr->Deprecated.getValue();
 
   if (Attr->Message.empty() && Attr->Rename.empty()) {
-    auto diagValue = std::move(
-      diagnose(ReferenceRange.Start, diag::availability_deprecated, Name,
-               Attr->hasPlatform(), Platform, Attr->Deprecated.hasValue(),
-               DeprecatedVersion)
-        .highlight(Attr->getRange()));
-    extraInfoHandler(diagValue);
+    diagnose(ReferenceRange.Start, diag::availability_deprecated, Name,
+             Attr->hasPlatform(), Platform, Attr->Deprecated.hasValue(),
+             DeprecatedVersion)
+      .highlight(Attr->getRange());
     return;
   }
 
   if (Attr->Message.empty()) {
-    auto diagValue = std::move(
-      diagnose(ReferenceRange.Start, diag::availability_deprecated_rename, Name,
-               Attr->hasPlatform(), Platform, Attr->Deprecated.hasValue(),
-               DeprecatedVersion, Attr->Rename)
-        .highlight(Attr->getRange()));
-    extraInfoHandler(diagValue);
+    diagnose(ReferenceRange.Start, diag::availability_deprecated_rename, Name,
+             Attr->hasPlatform(), Platform, Attr->Deprecated.hasValue(),
+             DeprecatedVersion, Attr->Rename)
+      .highlight(Attr->getRange());
   } else {
     EncodedDiagnosticMessage EncodedMessage(Attr->Message);
-    auto diagValue = std::move(
-      diagnose(ReferenceRange.Start, diag::availability_deprecated_msg, Name,
-               Attr->hasPlatform(), Platform, Attr->Deprecated.hasValue(),
-               DeprecatedVersion, EncodedMessage.Message)
-        .highlight(Attr->getRange()));
-    extraInfoHandler(diagValue);
+    diagnose(ReferenceRange.Start, diag::availability_deprecated_msg, Name,
+             Attr->hasPlatform(), Platform, Attr->Deprecated.hasValue(),
+             DeprecatedVersion, EncodedMessage.Message)
+      .highlight(Attr->getRange());
   }
 
   if (!Attr->Rename.empty()) {
diff --git a/lib/Sema/TypeChecker.h b/lib/Sema/TypeChecker.h
@@ -1757,9 +1757,7 @@ class TypeChecker final : public LazyResolver {
   void diagnoseDeprecated(SourceRange SourceRange,
                           const DeclContext *ReferenceDC,
                           const AvailableAttr *Attr,
-                          DeclName Name,
-              std::function<void(InFlightDiagnostic&)> extraInfoHandler =
-                          [](InFlightDiagnostic&){});
+                          DeclName Name);
   /// @}
 
   /// If LangOptions::DebugForbidTypecheckPrefix is set and the given decl
diff --git a/stdlib/public/core/FixedPoint.swift.gyb b/stdlib/public/core/FixedPoint.swift.gyb
@@ -619,32 +619,30 @@ public func ${op}=(lhs: inout ${Self}, rhs: ${Self}) {
 
 // Prefix and postfix increment and decrement.
 
-// FIXME: After <rdar://problem/20226526> is fixed, we should be able
-//        to remove these.
 @_transparent
-@available(*, deprecated, message: "it will be removed in Swift 3")
+@available(*, unavailable, message: "it has been removed in Swift 3")
 public prefix func ++ (x: inout ${Self}) -> ${Self} {
   x = x + 1
   return x
 }
 
 @_transparent
-@available(*, deprecated, message: "it will be removed in Swift 3")
+@available(*, unavailable, message: "it has been removed in Swift 3")
 public postfix func ++ (x: inout ${Self}) -> ${Self} {
   let ret = x
   x = x + 1
   return ret
 }
 
 @_transparent
-@available(*, deprecated, message: "it will be removed in Swift 3")
+@available(*, unavailable, message: "it has been removed in Swift 3")
 public prefix func -- (x: inout ${Self}) -> ${Self} {
   x = x - 1
   return x
 }
 
 @_transparent
-@available(*, deprecated, message: "it will be removed in Swift 3")
+@available(*, unavailable, message: "it has been removed in Swift 3")
 public postfix func -- (x: inout ${Self}) -> ${Self} {
   let ret = x
   x = x - 1
diff --git a/stdlib/public/core/FloatingPoint.swift.gyb b/stdlib/public/core/FloatingPoint.swift.gyb
@@ -564,16 +564,16 @@ extension ${Self} {
 //===----------------------------------------------------------------------===//
 
 @_transparent
-@available(*, deprecated, message: "it will be removed in Swift 3")
+@available(*, unavailable, message: "it has been removed in Swift 3")
 public prefix func ++ (rhs: inout ${Self}) -> ${Self} { rhs += 1.0; return rhs }
 @_transparent
-@available(*, deprecated, message: "it will be removed in Swift 3")
+@available(*, unavailable, message: "it has been removed in Swift 3")
 public prefix func -- (rhs: inout ${Self}) -> ${Self} { rhs -= 1.0; return rhs }
 @_transparent
-@available(*, deprecated, message: "it will be removed in Swift 3")
+@available(*, unavailable, message: "it has been removed in Swift 3")
 public postfix func ++ (lhs: inout ${Self}) -> ${Self} { let tmp = lhs; lhs += 1.0; return tmp }
 @_transparent
-@available(*, deprecated, message: "it will be removed in Swift 3")
+@available(*, unavailable, message: "it has been removed in Swift 3")
 public postfix func -- (lhs: inout ${Self}) -> ${Self} { let tmp = lhs; lhs -= 1.0; return tmp }
 
 
diff --git a/stdlib/public/core/Index.swift b/stdlib/public/core/Index.swift
@@ -54,7 +54,7 @@ public struct _DisabledRangeIndex_ {
 /// Replace `i` with its `successor()` and return the updated value of
 /// `i`.
 @_transparent
-@available(*, deprecated, message: "it will be removed in Swift 3")
+@available(*, unavailable, message: "it has been removed in Swift 3")
 public prefix func ++ <T : _Incrementable> (i: inout T) -> T {
   i._successorInPlace()
   return i
@@ -63,7 +63,7 @@ public prefix func ++ <T : _Incrementable> (i: inout T) -> T {
 /// Replace `i` with its `successor()` and return the original
 /// value of `i`.
 @_transparent
-@available(*, deprecated, message: "it will be removed in Swift 3")
+@available(*, unavailable, message: "it has been removed in Swift 3")
 public postfix func ++ <T : _Incrementable> (i: inout T) -> T {
   let ret = i
   i._successorInPlace()
@@ -308,7 +308,7 @@ extension BidirectionalIndex {
 /// Replace `i` with its `predecessor()` and return the updated value
 /// of `i`.
 @_transparent
-@available(*, deprecated, message: "it will be removed in Swift 3")
+@available(*, unavailable, message: "it has been removed in Swift 3")
 public prefix func -- <T : BidirectionalIndex> (i: inout T) -> T {
   i._predecessorInPlace()
   return i
@@ -318,7 +318,7 @@ public prefix func -- <T : BidirectionalIndex> (i: inout T) -> T {
 /// Replace `i` with its `predecessor()` and return the original
 /// value of `i`.
 @_transparent
-@available(*, deprecated, message: "it will be removed in Swift 3")
+@available(*, unavailable, message: "it has been removed in Swift 3")
 public postfix func -- <T : BidirectionalIndex> (i: inout T) -> T {
   let ret = i
   i._predecessorInPlace()
diff --git a/test/Constraints/lvalues.swift b/test/Constraints/lvalues.swift
@@ -49,7 +49,6 @@ x += x
 var yi = y[i]
 
 // Non-settable lvalues
-// FIXME: better diagnostic!
 
 var non_settable_x : X {
   return x
@@ -78,28 +77,28 @@ f2(&non_settable_x) // expected-error{{cannot pass immutable value as inout argu
 f1(&non_settable_x) // expected-error{{cannot pass immutable value as inout argument: 'non_settable_x' is a get-only property}}
 // - inout assignment
 non_settable_x += x // expected-error{{left side of mutating operator isn't mutable: 'non_settable_x' is a get-only property}}
-++non_settable_x // expected-error{{cannot pass immutable value to mutating operator: 'non_settable_x' is a get-only property}}
+++non_settable_x // expected-error{{cannot pass immutable value as inout argument: 'non_settable_x' is a get-only property}}
 
 // non-settable property is non-settable:
 z.non_settable_x = x // expected-error{{cannot assign to property: 'non_settable_x' is a get-only property}}
 f2(&z.non_settable_x) // expected-error{{cannot pass immutable value as inout argument: 'non_settable_x' is a get-only property}}
 f1(&z.non_settable_x) // expected-error{{cannot pass immutable value as inout argument: 'non_settable_x' is a get-only property}}
 z.non_settable_x += x // expected-error{{left side of mutating operator isn't mutable: 'non_settable_x' is a get-only property}}
-++z.non_settable_x // expected-error{{cannot pass immutable value to mutating operator: 'non_settable_x' is a get-only property}}
+++z.non_settable_x // expected-error{{cannot pass immutable value as inout argument: 'non_settable_x' is a get-only property}}
 
 // non-settable subscript is non-settable:
 z[0] = 0.0 // expected-error{{cannot assign through subscript: subscript is get-only}}
 f2(&z[0]) // expected-error{{cannot pass immutable value as inout argument: subscript is get-only}}
 f1(&z[0]) // expected-error{{cannot pass immutable value as inout argument: subscript is get-only}}
 z[0] += 0.0 // expected-error{{left side of mutating operator isn't mutable: subscript is get-only}}
-++z[0] // expected-error{{cannot pass immutable value to mutating operator: subscript is get-only}}
+++z[0] // expected-error{{cannot pass immutable value as inout argument: subscript is get-only}}
 
 // settable property of an rvalue value type is non-settable:
 fz().settable_x = x // expected-error{{cannot assign to property: 'fz' returns immutable value}}
 f2(&fz().settable_x) // expected-error{{cannot pass immutable value as inout argument: 'fz' returns immutable value}}
 f1(&fz().settable_x) // expected-error{{cannot pass immutable value as inout argument: 'fz' returns immutable value}}
 fz().settable_x += x // expected-error{{left side of mutating operator isn't mutable: 'fz' returns immutable value}}
-++fz().settable_x // expected-error{{cannot pass immutable value to mutating operator: 'fz' returns immutable value}}
+++fz().settable_x // expected-error{{cannot pass immutable value as inout argument: 'fz' returns immutable value}}
 
 // settable property of an rvalue reference type IS SETTABLE:
 fref().property = 0.0
@@ -113,7 +112,7 @@ z.non_settable_x.property = 1.0 // expected-error{{cannot assign to property: 'n
 f2(&z.non_settable_x.property) // expected-error{{cannot pass immutable value as inout argument: 'non_settable_x' is a get-only property}}
 f1(&z.non_settable_x.property) // expected-error{{cannot pass immutable value as inout argument: 'non_settable_x' is a get-only property}}
 z.non_settable_x.property += 1.0 // expected-error{{left side of mutating operator isn't mutable: 'non_settable_x' is a get-only property}}
-++z.non_settable_x.property // expected-error{{cannot pass immutable value to mutating operator: 'non_settable_x' is a get-only property}}
+++z.non_settable_x.property // expected-error{{cannot pass immutable value as inout argument: 'non_settable_x' is a get-only property}}
 
 // settable property of a non-settable reference type IS SETTABLE:
 z.non_settable_reftype.property = 1.0
diff --git a/test/Misc/misc_diagnostics.swift b/test/Misc/misc_diagnostics.swift
@@ -136,7 +136,7 @@ func test20770032() {
 
 func tuple_splat1(_ a : Int, _ b : Int) {
   let x = (1,2)
-  tuple_splat1(x)          // expected-warning {{passing 2 arguments to a callee as a single tuple value is deprecated}}
+  tuple_splat1(x)          // expected-error {{passing 2 arguments to a callee as a single tuple value has been removed in Swift 3}}
   tuple_splat1(1, 2)       // Ok.
   tuple_splat1((1, 2))     // expected-error {{missing argument for parameter #2 in call}}
 }
diff --git a/test/Sema/diag_c_style_for.swift b/test/Sema/diag_c_style_for.swift
@@ -1,46 +1,46 @@
 // RUN: %target-parse-verify-swift
 
-// expected-warning @+1 {{'++' is deprecated: it will be removed in Swift 3}}
+// expected-error @+1 {{'++' is unavailable: it has been removed in Swift 3}}
 for var a = 0; a < 10; a++ { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}} {{5-9=}} {{10-13= in }} {{14-20= ..< }} {{22-27=}}
 }
 
-// expected-warning @+1 {{'++' is deprecated: it will be removed in Swift 3}}
+// expected-error @+1 {{'++' is unavailable: it has been removed in Swift 3}}
 for var b = 0; b < 10; ++b { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}} {{5-9=}} {{10-13= in }} {{14-20= ..< }} {{22-27=}}
 }
 
-// expected-warning @+1 {{'++' is deprecated: it will be removed in Swift 3}}
+// expected-error @+1 {{'++' is unavailable: it has been removed in Swift 3}}
 for var c=1;c != 5 ;++c { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}} {{5-9=}} {{10-11= in }} {{12-18= ..< }} {{20-24=}}
 }
 
-// expected-warning @+1 {{'++' is deprecated: it will be removed in Swift 3}}
+// expected-error @+1 {{'++' is unavailable: it has been removed in Swift 3}}
 for var d=100;d<5;d++ { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}} {{5-9=}} {{10-11= in }} {{14-17= ..< }} {{18-22=}}
 }
 
 // next three aren't auto-fixable
-// expected-warning @+1 {{'++' is deprecated: it will be removed in Swift 3}}
+// expected-error @+1 {{'++' is unavailable: it has been removed in Swift 3}}
 for var e = 3; e > 4; e++ { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}} {{none}}
 }
 
-// expected-warning @+1 {{'--' is deprecated: it will be removed in Swift 3}}
+// expected-error @+1 {{'--' is unavailable: it has been removed in Swift 3}}
 for var f = 3; f < 4; f-- { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}} {{none}}
 }
 
 let start = Int8(4)
 let count = Int8(10)
 var other = Int8(2)
 
-// expected-warning @+1 {{'++' is deprecated: it will be removed in Swift 3}}
+// expected-error @+1 {{'++' is unavailable: it has been removed in Swift 3}}
 for ; other<count; other++ { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}} {{none}}
 }
 
 // this should be fixable, and keep the type
-// expected-warning @+1 {{'++' is deprecated: it will be removed in Swift 3}}
+// expected-error @+1 {{'++' is unavailable: it has been removed in Swift 3}}
 for (var number : Int8 = start; number < count; number++) { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}} {{6-10=}} {{23-26= in }} {{31-42= ..< }} {{47-57=}}
   print(number)
 }
 
 // should produce extra note
-// expected-warning @+1 {{'++' is deprecated: it will be removed in Swift 3}}
+// expected-error @+1 {{'++' is unavailable: it has been removed in Swift 3}}
 for (var m : Int8 = start; m < count; ++m) { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}} {{none}} expected-note {{C-style for statement can't be automatically fixed to for-in, because the loop variable is modified inside the loop}}
   m += 3
 }
@@ -52,6 +52,6 @@ for var o = 2; o < 888; o += 11 { // expected-warning {{C-style for statement is
 }
 
 // could theoretically fix this with "..."
-// expected-warning @+1 {{'++' is deprecated: it will be removed in Swift 3}}
+// expected-error @+1 {{'++' is unavailable: it has been removed in Swift 3}}
 for var p = 2; p <= 8; p++ { // expected-warning {{C-style for statement is deprecated and will be removed in a future version of Swift}} {{none}}
 }
diff --git a/test/expr/expressions.swift b/test/expr/expressions.swift

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ func test20770032() {`
`136`	`136`
`137`	`137`	`func tuple_splat1(_ a : Int, _ b : Int) {`
`138`	`138`	`let x = (1,2)`
`139`		`- tuple_splat1(x) // expected-warning {{passing 2 arguments to a callee as a single tuple value is deprecated}}`
	`139`	`+ tuple_splat1(x) // expected-error {{passing 2 arguments to a callee as a single tuple value has been removed in Swift 3}}`
`140`	`140`	`tuple_splat1(1, 2) // Ok.`
`141`	`141`	`tuple_splat1((1, 2)) // expected-error {{missing argument for parameter #2 in call}}`
`142`	`142`	`}`