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

Want to directly use the locator anchor for RValueTreatedAsLValueFailure::diagnose() rather than the computed anchor. Assorted other cleanup, comment improvement.

Browse Source
This commit is contained in:
gregomni
2018-08-16 21:15:17 -07:00
parent eaf8c6d232
commit 44ce96a040
2 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
lib/Sema/CSDiagnostics.cpp
View File

@@ -530,42 +530,50 @@ bool MissingOptionalUnwrapFailure::diagnose() {
}
bool RValueTreatedAsLValueFailure::diagnose() {
if (auto callExpr = dyn_cast<ApplyExpr>(getAnchor())) {
Expr *argExpr = callExpr->getArg();
Diag<StringRef> subElementDiagID;
Diag<Type> rvalueDiagID;
Expr *diagExpr = getLocator()->getAnchor();
SourceLoc loc;
Diag<StringRef> subElementDiagID;
Diag<Type> rvalueDiagID;
Expr *diagExpr = nullptr;
auto callExpr = dyn_cast<ApplyExpr>(diagExpr);
if (!callExpr)
return false; // currently only creating these for args, so should be
// unreachable
if (isa<PrefixUnaryExpr>(callExpr) || isa<PostfixUnaryExpr>(callExpr)) {
subElementDiagID = diag::cannot_apply_lvalue_unop_to_subelement;
rvalueDiagID = diag::cannot_apply_lvalue_unop_to_rvalue;
diagExpr = argExpr;
} else if (isa<BinaryExpr>(callExpr)) {
subElementDiagID = diag::cannot_apply_lvalue_binop_to_subelement;
rvalueDiagID = diag::cannot_apply_lvalue_binop_to_rvalue;
auto argTuple = dyn_cast<TupleExpr>(argExpr);
diagExpr = argTuple->getElement(0);
} else {
auto lastPathElement = getLocator()->getPath().back();
assert(lastPathElement.getKind() == ConstraintLocator::PathElementKind::ApplyArgToParam);
Expr *argExpr = callExpr->getArg();
loc = callExpr->getFn()->getLoc();
subElementDiagID = diag::cannot_pass_rvalue_inout_subelement;
rvalueDiagID = diag::cannot_pass_rvalue_inout;
if (auto argTuple = dyn_cast<TupleExpr>(argExpr))
diagExpr = argTuple->getElement(lastPathElement.getValue());
else if (auto parens = dyn_cast<ParenExpr>(argExpr))
diagExpr = parens->getSubExpr();
}
if (isa<PrefixUnaryExpr>(callExpr) || isa<PostfixUnaryExpr>(callExpr)) {
subElementDiagID = diag::cannot_apply_lvalue_unop_to_subelement;
rvalueDiagID = diag::cannot_apply_lvalue_unop_to_rvalue;
diagExpr = argExpr;
} else if (isa<BinaryExpr>(callExpr)) {
subElementDiagID = diag::cannot_apply_lvalue_binop_to_subelement;
rvalueDiagID = diag::cannot_apply_lvalue_binop_to_rvalue;
auto argTuple = dyn_cast<TupleExpr>(argExpr);
diagExpr = argTuple->getElement(0);
} else {
auto lastPathElement = getLocator()->getPath().back();
assert(lastPathElement.getKind() ==
ConstraintLocator::PathElementKind::ApplyArgToParam);
// FIXME: Would like for this to be unnecessary.
getConstraintSystem().TC.typeCheckExpression(diagExpr, getConstraintSystem().DC);
diagnoseSubElementFailure(diagExpr, callExpr->getFn()->getLoc(),
getConstraintSystem(),
subElementDiagID, rvalueDiagID);
return true;
subElementDiagID = diag::cannot_pass_rvalue_inout_subelement;
rvalueDiagID = diag::cannot_pass_rvalue_inout;
if (auto argTuple = dyn_cast<TupleExpr>(argExpr))
diagExpr = argTuple->getElement(lastPathElement.getValue());
else if (auto parens = dyn_cast<ParenExpr>(argExpr))
diagExpr = parens->getSubExpr();
}
// These fixes are only being created for matching arg types right now, so this is unreachable.
return false;
// FIXME: Needed right now to apply correct overload choices to diagExpr for
// use by diagnoseSubElementFailure(). Once all callers are routed through
// here, that function can be rewritten to take the current Solution and use
// it for determining chosen decl bindings instead, making this extra
// typecheck unnecessary.
getConstraintSystem().TC.typeCheckExpression(diagExpr,
getConstraintSystem().DC);
diagnoseSubElementFailure(diagExpr, loc, getConstraintSystem(),
subElementDiagID, rvalueDiagID);
return true;
}