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

This commit is contained in:
swift_jenkins
2020-06-17 13:18:52 -07:00
7 changed files with 100 additions and 41 deletions

View File

@@ -800,6 +800,12 @@ void ConstraintSystem::shrink(Expr *expr) {
return {false, expr};
}
// Similar to 'ClosureExpr', 'TapExpr' has a 'VarDecl' the type of which
// is determined by type checking the parent interpolated string literal.
if (isa<TapExpr>(expr)) {
return {false, expr};
}
if (auto coerceExpr = dyn_cast<CoerceExpr>(expr)) {
if (coerceExpr->isLiteralInit())
ApplyExprs.push_back({coerceExpr, 1});