---

yaml
---
r: 341223
b: refs/heads/rxwei-patch-1
c: 7aaf71c
h: refs/heads/master
i:
  341221: 0a87525
  341219: d52919e
  341215: e143fb3

Author: LucianoPAlmeida

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: f9fd006c3035d4aebbf422c9a980e320ca842d91
+refs/heads/rxwei-patch-1: 7aaf71c216d165217ff797427b6113df08b592c7
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/lib/Sema/CSApply.cpp

@@ -3708,9 +3708,8 @@ namespace {
 
         cs.setExprTypes(sub);
 
-        sub = coerceToType(sub, toType, cs.getConstraintLocator(sub));
-
-        if (!sub) return nullptr;
+        if (tc.convertToType(sub, toType, cs.DC))
+          return nullptr;
 
         cs.cacheExprTypes(sub);
 

branches/rxwei-patch-1/lib/Sema/TypeCheckConstraints.cpp

@@ -3323,6 +3323,11 @@ bool TypeChecker::convertToType(Expr *&expr, Type type, DeclContext *dc,
   // TODO: need to add kind arg?
   // Construct a constraint system from this expression.
   ConstraintSystem cs(*this, dc, ConstraintSystemFlags::AllowFixes);
+    
+  // Cache the expression type on the system to ensure it is available
+  // on diagnostics if the convertion fails.
+  cs.cacheExprTypes(expr);
+
   // If there is a type that we're expected to convert to, add the conversion
   // constraint.
   cs.addConstraint(ConstraintKind::Conversion, expr->getType(), type,