Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

lib/Sema/CSDiag.cpp

@@ -5148,39 +5148,7 @@ bool FailureDiagnosis::visitApplyExpr(ApplyExpr *callExpr) {
     }
   }
 
-  // If we have an argument list (i.e., a scalar, or a non-zero-element tuple)
-  // then diagnose with some specificity about the arguments.
   bool isInitializer = isa<TypeExpr>(fnExpr);
-  if (!fnType->is<AnyMetatypeType>() &&
-      ((isa<TupleExpr>(argExpr) &&
-        cast<TupleExpr>(argExpr)->getNumElements() == 1) ||
-       (isa<ParenExpr>(argExpr) &&
-        !isa<LoadExpr>(cast<ParenExpr>(argExpr)->getSubExpr())))) {
-    if (auto ctorRef = dyn_cast<UnresolvedDotExpr>(fnExpr)) {
-      if (ctorRef->getName().isSimpleName(DeclBaseName::createConstructor())) {
-        // Diagnose 'super.init', which can only appear inside another
-        // initializer, specially.
-        if (isa<SuperRefExpr>(ctorRef->getBase())) {
-          diagnose(fnExpr->getLoc(),
-                   diag::super_initializer_not_in_initializer);
-          calleeInfo.suggestPotentialOverloads(fnExpr->getLoc());
-          return true;
-        }
-
-        // Suggest inserting a call to 'type(of:)' to construct another object
-        // of the same dynamic type.
-        SourceRange fixItRng = ctorRef->getNameLoc().getSourceRange();
-
-        // Surround the caller in `type(of:)`.
-        diagnose(fnExpr->getLoc(), diag::init_not_instance_member)
-            .fixItInsert(fixItRng.Start, "type(of: ")
-            .fixItInsertAfter(fixItRng.End, ")");
-        calleeInfo.suggestPotentialOverloads(fnExpr->getLoc());
-        return true;
-      }
-    }
-  }
-
   if (isa<TupleExpr>(argExpr) &&
       cast<TupleExpr>(argExpr)->getNumElements() == 0) {
     // Emit diagnostics that say "no arguments".

test/expr/postfix/dot/init_ref_delegation.swift

@@ -547,3 +547,13 @@ struct MultipleMemberAccesses {
     y2.x2.init() // expected-error {{'init' is a member of the type; use 'type(of: ...)' to initialize a new object of the same dynamic type}} {{5-5=type(of: }} {{10-10=)}}
   }
 }
+
+func sr10670() {
+  struct S {
+    init(_ x: inout String) {}
+    init(_ x: inout [Int]) {}
+  }
+  var a = 0
+  S.init(&a) // expected-error {{cannot invoke 'S.Type.init' with an argument list of type '(inout Int)'}}
+  // expected-note@-1 {{overloads for 'S.Type.init' exist with these partially matching parameter lists: (inout String), (inout [Int])}}
+}