---

yaml
---
r: 326006
b: refs/heads/master-next
c: 1a57fc4
h: refs/heads/master

Author: xedin

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: e052da7d8886fa0439677852e8f7830b20c2e1da
-refs/heads/master-next: 6d5cf3e43d45c0bdac6732ac5f3876573fe669bf
+refs/heads/master-next: 1a57fc403a4ccdc194d2a0d501632422b9e2e70a
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/Sema/CSDiagnostics.cpp

@@ -4466,6 +4466,19 @@ bool ArgumentMismatchFailure::diagnoseAsError() {
     diagnostic = diag::cannot_convert_argument_value_protocol;
 
   auto diag = emitDiagnostic(getLoc(), diagnostic, argType, paramType);
+
+  // If argument is an l-value type and parameter is a pointer type,
+  // let's match up its element type to the argument to see whether
+  // it would be appropriate to suggest adding `&`.
+  auto *argExpr = getAnchor();
+  if (getType(argExpr)->is<LValueType>()) {
+    auto elementTy = paramType->getAnyPointerElementType();
+    if (elementTy && argType->isEqual(elementTy)) {
+      diag.fixItInsert(argExpr->getStartLoc(), "&");
+      return true;
+    }
+  }
+
   tryFixIts(diag);
   return true;
 }

branches/master-next/lib/Sema/CSSimplify.cpp

@@ -2574,6 +2574,12 @@ bool ConstraintSystem::repairFailures(
         }))
       break;
 
+    // If this is something like `[A] argument conv [B]` where `A` and `B`
+    // are unrelated types, let's give `matchTypes` a chance to consider
+    // element types.
+    if (hasConversionOrRestriction(ConversionRestrictionKind::DeepEquality))
+      break;
+
     conversionsOrFixes.push_back(AllowArgumentMismatch::create(
         *this, lhs, rhs, getConstraintLocator(locator)));
     break;