Skip to content

[CSApply] NFC: Unify transform for expressions with a single sub-expr… #85214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2025
Merged

[CSApply] NFC: Unify transform for expressions with a single sub-expr… #85214

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 22 additions & 58 deletions lib/Sema/CSApply.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3285,8 +3285,7 @@ namespace {
}

Expr *visitSuperRefExpr(SuperRefExpr *expr) {
simplifyExprType(expr);
return expr;
return simplifyExprType(expr);
}

Expr *visitTypeExpr(TypeExpr *expr) {
Expand Down Expand Up @@ -3710,55 +3709,34 @@ namespace {
return expr;
}

Expr *visitCopyExpr(CopyExpr *expr) {
auto toType = simplifyType(cs.getType(expr));
cs.setType(expr, toType);
/// Given an expression that has a single sub-expression,
/// resolve and set the type for the expression and coerce
/// its sub-expression to the resolved type. This is a common
/// operation for expressions like Copy, Consume, and *Try.
template <class E>
Expr *transformExprWithSubExpr(E *expr) {
simplifyExprType(expr);

auto *subExpr = expr->getSubExpr();
auto type = simplifyType(cs.getType(subExpr));

// Let's load the value associated with this try.
if (type->hasLValueType()) {
subExpr = coerceToType(subExpr, type->getRValueType(),
cs.getConstraintLocator(subExpr));

if (!subExpr)
return nullptr;
}
subExpr = coerceToType(subExpr, cs.getType(expr),
cs.getConstraintLocator(subExpr));
if (!subExpr)
return nullptr;

expr->setSubExpr(subExpr);

return expr;
}

Expr *visitConsumeExpr(ConsumeExpr *expr) {
auto toType = simplifyType(cs.getType(expr));
cs.setType(expr, toType);

auto *subExpr = expr->getSubExpr();
auto type = simplifyType(cs.getType(subExpr));

// Let's load the value associated with this consume.
if (type->hasLValueType()) {
subExpr = coerceToType(subExpr, type->getRValueType(),
cs.getConstraintLocator(subExpr));

if (!subExpr)
return nullptr;
}

expr->setSubExpr(subExpr);
Expr *visitCopyExpr(CopyExpr *expr) {
return transformExprWithSubExpr(expr);
}

return expr;
Expr *visitConsumeExpr(ConsumeExpr *expr) {
return transformExprWithSubExpr(expr);
}

Expr *visitAnyTryExpr(AnyTryExpr *expr) {
simplifyExprType(expr);

auto *subExpr = expr->getSubExpr();
expr->setSubExpr(coerceToType(subExpr, cs.getType(expr),
cs.getConstraintLocator(subExpr)));
return expr;
return transformExprWithSubExpr(expr);
}

Expr *visitOptionalTryExpr(OptionalTryExpr *expr) {
Expand All @@ -3775,16 +3753,8 @@ namespace {
// Nothing to do for Swift 4 and earlier!
return simplifyExprType(expr);
}

Type exprType = simplifyType(cs.getType(expr));

auto subExpr = coerceToType(expr->getSubExpr(), exprType,
cs.getConstraintLocator(expr));
if (!subExpr) return nullptr;
expr->setSubExpr(subExpr);

cs.setType(expr, exprType);
return expr;
return transformExprWithSubExpr(expr);
}

Expr *visitParenExpr(ParenExpr *expr) {
Expand All @@ -3793,7 +3763,7 @@ namespace {

// A ParenExpr can end up with a tuple type if it contains
// a pack expansion. Rewrite it to a TupleExpr.
if (dyn_cast<PackExpansionExpr>(expr->getSubExpr())) {
if (isa<PackExpansionExpr>(expr->getSubExpr())) {
result = TupleExpr::create(ctx, expr->getLParenLoc(),
{expr->getSubExpr()},
/*elementNames=*/{},
Expand Down Expand Up @@ -3948,8 +3918,7 @@ namespace {
}

Expr *visitTupleElementExpr(TupleElementExpr *expr) {
simplifyExprType(expr);
return expr;
return simplifyExprType(expr);
}

Expr *visitCaptureListExpr(CaptureListExpr *expr) {
Expand All @@ -3976,12 +3945,7 @@ namespace {
}

Expr *visitVarargExpansionExpr(VarargExpansionExpr *expr) {
simplifyExprType(expr);

auto arrayTy = cs.getType(expr);
expr->setSubExpr(coerceToType(expr->getSubExpr(), arrayTy,
cs.getConstraintLocator(expr)));
return expr;
return transformExprWithSubExpr(expr);
}

Expr *visitPackExpansionExpr(PackExpansionExpr *expr) {
Expand Down