Skip to content

Commit 9a8f827

Browse files
authored
Merge pull request #80085 from xedin/fix-assignFixedType-use
[CSSimplify] NFC: `assignFixedType` no longer accepts a locator
2 parents 7e7b234 + e0f9e65 commit 9a8f827

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

lib/Sema/CSSimplify.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12039,8 +12039,7 @@ bool ConstraintSystem::resolveClosure(TypeVariableType *typeVar,
1203912039
if (!shouldAttemptFixes())
1204012040
return false;
1204112041

12042-
assignFixedType(typeVar, PlaceholderType::get(getASTContext(), typeVar),
12043-
closureLocator);
12042+
assignFixedType(typeVar, PlaceholderType::get(getASTContext(), typeVar));
1204412043
recordTypeVariablesAsHoles(inferredClosureType);
1204512044

1204612045
return !recordFix(
@@ -12208,7 +12207,7 @@ bool ConstraintSystem::resolveClosure(TypeVariableType *typeVar,
1220812207
auto closureType =
1220912208
FunctionType::get(parameters, inferredClosureType->getResult(),
1221012209
closureExtInfo);
12211-
assignFixedType(typeVar, closureType, closureLocator);
12210+
assignFixedType(typeVar, closureType);
1221212211

1221312212
// If there is a result builder to apply, do so now.
1221412213
if (resultBuilderType) {
@@ -12236,7 +12235,7 @@ bool ConstraintSystem::resolvePackExpansion(TypeVariableType *typeVar,
1223612235
locator->castLastElementTo<LocatorPathElt::PackExpansionType>()
1223712236
.getOpenedType();
1223812237

12239-
assignFixedType(typeVar, openedExpansionType, locator);
12238+
assignFixedType(typeVar, openedExpansionType);
1224012239
return true;
1224112240
}
1224212241

@@ -12247,7 +12246,7 @@ bool ConstraintSystem::resolveTapBody(TypeVariableType *typeVar,
1224712246
auto *tapExpr = castToExpr<TapExpr>(tapLoc->getAnchor());
1224812247

1224912248
// Assign a type to tap expression itself.
12250-
assignFixedType(typeVar, contextualType, getConstraintLocator(locator));
12249+
assignFixedType(typeVar, contextualType);
1225112250
// Set type to `$interpolation` variable declared in the body of tap
1225212251
// expression.
1225312252
setType(tapExpr->getVar(), contextualType);

0 commit comments

Comments
 (0)