[CSFix] Adjusting tuple mismatch to handle optionals

Author: LucianoPAlmeida

lib/Sema/CSFix.cpp

@@ -289,7 +289,7 @@ getStructuralTypeContext(const Solution &solution, ConstraintLocator *locator) {
   } else if (auto *assignExpr = getAsExpr<AssignExpr>(locator->getAnchor())) {
     return std::make_tuple(CTP_AssignSource,
                            solution.getType(assignExpr->getSrc()),
-                           solution.getType(assignExpr->getDest()));
+                           solution.getType(assignExpr->getDest())->getRValueType());
   } else if (auto *call = getAsExpr<CallExpr>(locator->getAnchor())) {
     assert(isa<TypeExpr>(call->getFn()));
     return std::make_tuple(
@@ -332,8 +332,10 @@ bool AllowTupleTypeMismatch::coalesceAndDiagnose(
     return false;
   }
 
-  TupleContextualFailure failure(solution, purpose, fromType, toType, indices,
-                                 locator);
+  TupleContextualFailure failure(solution, purpose,
+                                 fromType->lookThroughAllOptionalTypes(),
+                                 toType->lookThroughAllOptionalTypes(),
+                                 indices, locator);
   return failure.diagnose(asNote);
 }