Skip to content

[Diagnostics] Refactor FailureDiagnostic to operate on TypedNode #31104

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 8 commits into from
Apr 20, 2020
Merged

[Diagnostics] Refactor FailureDiagnostic to operate on TypedNode #31104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ed3665
[Diagnostics] Provide anchors on demand instead of storing in `Failur…
xedin Apr 15, 2020
f5714bf
[Diagnostics] Switch `get{Raw}Anchor` to return `TypedNode`
xedin Apr 15, 2020
71ab19b
[Diagnostics] Switch `getConstraintLocator` variants to accept `Typed…
xedin Apr 16, 2020
66a07ba
[Diagnostics] Switch `getContextualType*` to use `TypedNode`
xedin Apr 16, 2020
08e09fc
[Diagnostics] Switch `getType` to use `TypedNode`
xedin Apr 16, 2020
6335a4f
[Diagnostics] Resolve const-ness problems introduced by `TypedNode`
xedin Apr 16, 2020
4ea7f3b
[Diagnostics] Add helper functions to work with anchors - `{castTo, g…
xedin Apr 17, 2020
967b3a3
[Diagnostics] Adjust `getCallInfo` to accept `TypedNode` instead of e…
xedin Apr 17, 2020
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
7 changes: 6 additions & 1 deletion include/swift/AST/Expr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3759,7 +3759,12 @@ class ClosureExpr : public AbstractClosureExpr {
assert(hasExplicitResultType() && "No explicit result type");
return ExplicitResultType;
}


TypeRepr *getExplicitResultTypeRepr() const {
assert(hasExplicitResultType() && "No explicit result type");
return ExplicitResultType.getTypeRepr();
}

void setExplicitResultType(SourceLoc arrowLoc, TypeLoc resultType) {
ArrowLoc = arrowLoc;
ExplicitResultType = resultType;
Expand Down
11 changes: 9 additions & 2 deletions lib/Sema/CSApply.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,17 @@ ConstraintLocator *Solution::getCalleeLocator(ConstraintLocator *locator,
}

ConstraintLocator *
Solution::getConstraintLocator(Expr *anchor,
Solution::getConstraintLocator(const Expr *anchor,
ArrayRef<LocatorPathElt> path) const {
auto &cs = getConstraintSystem();
return cs.getConstraintLocator(anchor, path);
return cs.getConstraintLocator(const_cast<Expr *>(anchor), path);
}

ConstraintLocator *
Solution::getConstraintLocator(ConstraintLocator *base,
ArrayRef<LocatorPathElt> path) const {
auto &cs = getConstraintSystem();
return cs.getConstraintLocator(base, path);
}

/// Return the implicit access kind for a MemberRefExpr with the
Expand Down
Loading