Skip to content

[CSDiag] Mark all sub-expressions which are about to be re-typechecked #22121

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
Jan 25, 2019
Merged

[CSDiag] Mark all sub-expressions which are about to be re-typechecked #22121

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
14 changes: 12 additions & 2 deletions lib/Sema/CSDiag.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1753,10 +1753,11 @@ Expr *FailureDiagnosis::typeCheckChildIndependently(
CS.cacheExprTypes(savedExpr);
return savedExpr;
}

CS.TC.addExprForDiagnosis(subExpr, subExpr);
}

// Mark current expression as about to be diagnosed.
CS.TC.addExprForDiagnosis(subExpr, subExpr);

// Validate contextual type before trying to use it.
std::tie(convertType, convertTypePurpose) =
validateContextualType(convertType, convertTypePurpose);
Expand Down Expand Up @@ -5651,6 +5652,15 @@ bool FailureDiagnosis::visitAssignExpr(AssignExpr *assignExpr) {
return true;
}

// Situation like `var foo = &bar` didn't get diagnosed early
// because originally its parent is a `SequenceExpr` which hasn't
// been folded yet, and could represent an operator which accepts
// `inout` arguments.
if (auto *AddrOf = dyn_cast<InOutExpr>(assignExpr->getSrc())) {
diagnose(AddrOf->getLoc(), diag::extraneous_address_of);
return true;
}

if (CS.TC.diagnoseSelfAssignment(assignExpr))
return true;

Expand Down