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

Remove some remaining TypeCheckers

Browse Source
This commit is contained in:
Robert Widmann
2019-11-06 15:08:22 -08:00
parent 7b9d28d7ba
commit fb8b0600ad
3 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Sema/CSDiagnostics.cpp
View File

@@ -89,7 +89,7 @@ template <typename... ArgTypes>
InFlightDiagnostic
FailureDiagnostic::emitDiagnostic(ArgTypes &&... Args) const {
auto &cs = getConstraintSystem();
return cs.TC.diagnose(std::forward<ArgTypes>(Args)...);
return cs.getASTContext().Diags.diagnose(std::forward<ArgTypes>(Args)...);
}
Expr *FailureDiagnostic::findParentExpr(Expr *subExpr) const {
@@ -1476,8 +1476,9 @@ bool TypeChecker::diagnoseSelfAssignment(const Expr *expr) {
auto srcDecl = findReferencedDecl(srcExpr);
if (dstDecl.second && dstDecl == srcDecl) {
diagnose(expr->getLoc(), dstDecl.first ? diag::self_assignment_prop
: diag::self_assignment_var)
auto &DE = dstDecl.second->getASTContext().Diags;
DE.diagnose(expr->getLoc(), dstDecl.first ? diag::self_assignment_prop
: diag::self_assignment_var)
.highlight(dstExpr->getSourceRange())
.highlight(srcExpr->getSourceRange());
return true;