averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[CSSyntacticElement] Only set default if generator has no errors

Browse Source
This commit is contained in:
Angela Laar
2022-11-15 23:28:48 -08:00
parent 5d93b99a91
commit 45fb9899d6
1 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/Sema/CSSyntacticElement.cpp
View File

@@ -907,24 +907,34 @@ private:
void visitBraceStmt(BraceStmt *braceStmt) {
auto &ctx = cs.getASTContext();
if (auto closure = cast<ClosureExpr>(context.getAsAbstractClosureExpr().getPtrOrNull()); context.getBody() == braceStmt) {
// If this closure has an empty body and no explicit result type
// let's bind result type to `Void` since that's the only type empty body
// can produce. Otherwise, if (multi-statement) closure doesn't have
// an explicit result (no `return` statements) let's default it to `Void`.
if (!constraints::hasExplicitResult(closure)) {
auto constraintKind =
(closure->hasEmptyBody() && !closure->hasExplicitResultType())
? ConstraintKind::Bind
: ConstraintKind::Defaultable;
auto addResultDefault = [&](ClosureExpr *closure) {
if (context.getBody() == braceStmt) {
// If this closure has an empty body and no explicit result type
// let's bind result type to `Void` since that's the only type empty
// body can produce. Otherwise, if (multi-statement) closure doesn't
// have an explicit result (no `return` statements) let's default it to
// `Void`.
if (!constraints::hasExplicitResult(closure)) {
auto constraintKind =
(closure->hasEmptyBody() && !closure->hasExplicitResultType())
? ConstraintKind::Bind
: ConstraintKind::Defaultable;
cs.addConstraint(
constraintKind, cs.getClosureType(closure)->getResult(),
ctx.TheEmptyTupleType,
cs.getConstraintLocator(closure, ConstraintLocator::ClosureResult));
cs.addConstraint(constraintKind,
cs.getClosureType(closure)->getResult(),
ctx.TheEmptyTupleType,
cs.getConstraintLocator(
closure, ConstraintLocator::ClosureResult));
}
}
if (!cs.participatesInInference(closure))
};
if (auto closure = cast<ClosureExpr>(
context.getAsAbstractClosureExpr().getPtrOrNull())) {
if (!cs.participatesInInference(closure)) {
addResultDefault(closure);
return;
}
}
if (context.isSingleExpressionClosure(cs)) {
@@ -941,6 +951,10 @@ private:
visitDecl(node.get<Decl *>());
}
}
if (!hadError)
addResultDefault(cast<ClosureExpr>(
context.getAsAbstractClosureExpr().getPtrOrNull()));
return;
}
@@ -974,6 +988,10 @@ private:
/*contextualInfo=*/{}, isDiscarded));
}
if (!hadError)
addResultDefault(
cast<ClosureExpr>(context.getAsAbstractClosureExpr().getPtrOrNull()));
createConjunction(cs, elements, locator);
}