Skip to content

Commit 3570905

Browse files
committed
[NFC] Update uses in TypeCheckConstraints
Seems to have been a mismerge or something?
1 parent 6a8598a commit 3570905

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

lib/Sema/TypeCheckConstraints.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ Expr *TypeChecker::resolveDeclRefExpr(UnresolvedDeclRefExpr *UDRE,
655655
D->getInterfaceType());
656656
}
657657

658-
return TypeExpr::createForDecl(Loc, D,
658+
return TypeExpr::createForDecl(UDRE->getNameLoc(), D,
659659
Lookup[0].getDeclContext(),
660660
UDRE->isImplicit());
661661
}
@@ -747,12 +747,13 @@ Expr *TypeChecker::resolveDeclRefExpr(UnresolvedDeclRefExpr *UDRE,
747747
if (AllMemberRefs) {
748748
Expr *BaseExpr;
749749
if (auto PD = dyn_cast<ProtocolDecl>(Base)) {
750-
BaseExpr = TypeExpr::createForDecl(Loc,
750+
BaseExpr = TypeExpr::createForDecl(UDRE->getNameLoc(),
751751
PD->getGenericParams()->getParams().front(),
752752
/*DC*/nullptr,
753753
/*isImplicit=*/true);
754754
} else if (auto NTD = dyn_cast<NominalTypeDecl>(Base)) {
755-
BaseExpr = TypeExpr::createForDecl(Loc, NTD, BaseDC, /*isImplicit=*/true);
755+
BaseExpr = TypeExpr::createForDecl(UDRE->getNameLoc(), NTD, BaseDC,
756+
/*isImplicit=*/true);
756757
} else {
757758
BaseExpr = new (Context) DeclRefExpr(Base, UDRE->getNameLoc(),
758759
/*Implicit=*/true);
@@ -1416,9 +1417,8 @@ TypeExpr *PreCheckExpression::simplifyNestedTypeExpr(UnresolvedDotExpr *UDE) {
14161417
// If there is no nested type with this name, we have a lookup of
14171418
// a non-type member, so leave the expression as-is.
14181419
if (Result.size() == 1) {
1419-
return TypeExpr::createForMemberDecl(DRE->getNameLoc().getBaseNameLoc(),
1420-
TD, NameLoc,
1421-
Result.front().Member);
1420+
return TypeExpr::createForMemberDecl(
1421+
DRE->getNameLoc(), TD, UDE->getNameLoc(), Result.front().Member);
14221422
}
14231423
}
14241424

@@ -1472,7 +1472,7 @@ TypeExpr *PreCheckExpression::simplifyNestedTypeExpr(UnresolvedDotExpr *UDE) {
14721472
// If there is no nested type with this name, we have a lookup of
14731473
// a non-type member, so leave the expression as-is.
14741474
if (Result.size() == 1) {
1475-
return TypeExpr::createForMemberDecl(ITR, NameLoc,
1475+
return TypeExpr::createForMemberDecl(ITR, UDE->getNameLoc(),
14761476
Result.front().Member);
14771477
}
14781478
}

0 commit comments

Comments
 (0)