Merge pull request #3749 from nkcsgexi/coerce-fixit

Author: swift-ci

lib/Sema/CSDiag.cpp

@@ -3407,8 +3407,10 @@ static bool isIntegerToStringIndexConversion(Type fromType, Type toType,
 ///   expected, by wrapping the expression in a call to the rawValue
 ///   accessor
 ///
+/// - Return true on the fixit is added, false otherwise.
+///
 /// This helps migration with SDK changes.
-static void tryRawRepresentableFixIts(InFlightDiagnostic &diag,
+static bool tryRawRepresentableFixIts(InFlightDiagnostic &diag,
                                       ConstraintSystem *CS,
                                       Type fromType,
                                       Type toType,
@@ -3459,7 +3461,7 @@ static void tryRawRepresentableFixIts(InFlightDiagnostic &diag,
         convWrapAfter += ")";
       }
       fixIt(convWrapBefore, convWrapAfter);
-      return;
+      return true;
     }
   }
 
@@ -3473,9 +3475,10 @@ static void tryRawRepresentableFixIts(InFlightDiagnostic &diag,
         convWrapAfter += ")";
       }
       fixIt(convWrapBefore, convWrapAfter);
-      return;
+      return true;
     }
   }
+  return false;
 }
 
 /// Attempts to add fix-its for these two mistakes:
@@ -3486,14 +3489,16 @@ static void tryRawRepresentableFixIts(InFlightDiagnostic &diag,
 /// - Passing an integer but expecting different integer type. The fixit adds
 ///   a wrapping cast.
 ///
+/// - Return true on the fixit is added, false otherwise.
+///
 /// This helps migration with SDK changes.
-static void tryIntegerCastFixIts(InFlightDiagnostic &diag,
+static bool tryIntegerCastFixIts(InFlightDiagnostic &diag,
                                  ConstraintSystem *CS,
                                  Type fromType,
                                  Type toType,
                                  Expr *expr) {
   if (!isIntegerType(fromType, CS) || !isIntegerType(toType, CS))
-    return;
+    return false;
 
   auto getInnerCastedExpr = [&]() -> Expr* {
     CallExpr *CE = dyn_cast<CallExpr>(expr);
@@ -3513,7 +3518,7 @@ static void tryIntegerCastFixIts(InFlightDiagnostic &diag,
       // Remove the unnecessary cast.
       diag.fixItRemoveChars(expr->getLoc(), innerE->getStartLoc())
         .fixItRemove(expr->getEndLoc());
-      return;
+      return true;
     }
   }
 
@@ -3524,6 +3529,24 @@ static void tryIntegerCastFixIts(InFlightDiagnostic &diag,
   SourceRange exprRange = expr->getSourceRange();
   diag.fixItInsert(exprRange.Start, convWrapBefore);
   diag.fixItInsertAfter(exprRange.End, convWrapAfter);
+  return true;
+}
+
+static bool
+addTypeCoerceFixit(InFlightDiagnostic &diag, ConstraintSystem *CS,
+                   Type fromType, Type toType, Expr *expr) {
+  if (CS->getTypeChecker().typeCheckCheckedCast(fromType, toType, CS->DC,
+      SourceLoc(), SourceRange(), SourceRange(), [](Type T) { return false; },
+      true) != CheckedCastKind::Unresolved) {
+    SmallString<32> buffer;
+    llvm::raw_svector_ostream OS(buffer);
+    toType->print(OS);
+    diag.fixItInsert(Lexer::getLocForEndOfToken(CS->DC->getASTContext().SourceMgr,
+                                                expr->getEndLoc()),
+                     (llvm::Twine(" as! ") + OS.str()).str());
+    return true;
+  }
+  return false;
 }
 
 bool FailureDiagnosis::diagnoseContextualConversionError() {
@@ -3800,11 +3823,12 @@ bool FailureDiagnosis::diagnoseContextualConversionError() {
   case CTP_DictionaryValue:
     tryRawRepresentableFixIts(diag, CS, exprType, contextualType,
                               KnownProtocolKind::ExpressibleByIntegerLiteral,
-                              expr);
+                              expr) ||
     tryRawRepresentableFixIts(diag, CS, exprType, contextualType,
                               KnownProtocolKind::ExpressibleByStringLiteral,
-                              expr);
-    tryIntegerCastFixIts(diag, CS, exprType, contextualType, expr);
+                              expr) ||
+    tryIntegerCastFixIts(diag, CS, exprType, contextualType, expr) ||
+    addTypeCoerceFixit(diag, CS, exprType, contextualType, expr);
     break;
 
   default:

test/Sema/diag_type_conversion.swift

@@ -15,3 +15,22 @@ func foo3 () {
   foo2(1) // expected-error {{cannot convert value of type 'Int' to expected argument type 'UnsafePointer<Int>'}} {{none}}
   foo4(1) // expected-error {{cannot convert value of type 'Int' to expected argument type 'UnsafeMutablePointer<Int>'}} {{none}}
 }
+
+class A {}
+class B : A {}
+func foo5(b : B) {}
+func foo6(a : A) {
+  foo5(b : a) // expected-error {{cannot convert value of type 'A' to expected argument type 'B'}} {{13-13= as! B}}
+}
+
+func foo7(b : [B]) {}
+func foo8(a : [A]) {
+  foo7(b : a) // expected-error {{cannot convert value of type '[A]' to expected argument type '[B]'}} {{13-13= as! [B]}}
+}
+
+protocol P1 {}
+struct S1 : P1 {}
+func foo9(s : S1) {}
+func foo10(p : P1) {
+  foo9(s : p) // expected-error {{cannot convert value of type 'P1' to expected argument type 'S1'}} {{13-13= as! S1}}
+}