Merge pull request #29085 from xedin/add-null-check-for-repair-failures

shahmishal · web-flow · commit a82855bba684 · 2020-01-08T17:23:47.000-08:00
[Diagnostics] Add nullptr check for anchor while fixing function resu…
diff --git a/lib/Sema/CSSimplify.cpp b/lib/Sema/CSSimplify.cpp
@@ -3509,7 +3509,7 @@ bool ConstraintSystem::repairFailures(
       }
     }
     // Handle function result coerce expression wrong type conversion.
-    if (isa<CoerceExpr>(anchor)) {
+    if (anchor && isa<CoerceExpr>(anchor)) {
       auto *fix =
           ContextualMismatch::create(*this, lhs, rhs, loc);
       conversionsOrFixes.push_back(fix);

Original file line number	Diff line number	Diff line change
`@@ -3509,7 +3509,7 @@ bool ConstraintSystem::repairFailures(`
`3509`	`3509`	`}`
`3510`	`3510`	`}`
`3511`	`3511`	`// Handle function result coerce expression wrong type conversion.`
`3512`		`- if (isa<CoerceExpr>(anchor)) {`
	`3512`	`+ if (anchor && isa<CoerceExpr>(anchor)) {`
`3513`	`3513`	`auto *fix =`
`3514`	`3514`	`ContextualMismatch::create(*this, lhs, rhs, loc);`
`3515`	`3515`	`conversionsOrFixes.push_back(fix);`