Skip to content

Commit 865c040

Browse files
committed
AST: Rename TypeTransform::transformSubMap()
TypeSubstituter's version was called transformSubstitutionMap(), and it was never being called as a result. Rename the first one to match.
1 parent 75c8a16 commit 865c040

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

include/swift/AST/TypeTransform.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ case TypeKind::Id:
154154
return *result;
155155

156156
auto subMap = opaque->getSubstitutions();
157-
auto newSubMap = asDerived().transformSubMap(subMap);
157+
auto newSubMap = asDerived().transformSubstitutionMap(subMap);
158158
if (newSubMap == subMap)
159159
return t;
160160
if (!newSubMap)
@@ -177,7 +177,7 @@ case TypeKind::Id:
177177
auto subMap = env->getOuterSubstitutions();
178178
auto uuid = env->getOpenedExistentialUUID();
179179

180-
auto newSubMap = asDerived().transformSubMap(subMap);
180+
auto newSubMap = asDerived().transformSubstitutionMap(subMap);
181181
if (newSubMap == subMap)
182182
return t;
183183
if (!newSubMap)
@@ -259,7 +259,7 @@ case TypeKind::Id:
259259
}
260260

261261
auto oldSubMap = boxTy->getSubstitutions();
262-
auto newSubMap = asDerived().transformSubMap(oldSubMap);
262+
auto newSubMap = asDerived().transformSubstitutionMap(oldSubMap);
263263
if (oldSubMap && !newSubMap)
264264
return Type();
265265
changed |= (oldSubMap != newSubMap);
@@ -281,7 +281,7 @@ case TypeKind::Id:
281281
return fnTy;
282282

283283
auto updateSubs = [&](SubstitutionMap &subs) -> bool {
284-
auto newSubs = asDerived().transformSubMap(subs);
284+
auto newSubs = asDerived().transformSubstitutionMap(subs);
285285
if (subs && !newSubs)
286286
return false;
287287
if (subs == newSubs)
@@ -1052,7 +1052,7 @@ case TypeKind::Id:
10521052

10531053
// If original was non-empty and transformed is empty, we're
10541054
// signaling failure, that is, a Type() return from doIt().
1055-
SubstitutionMap transformSubMap(SubstitutionMap subs) {
1055+
SubstitutionMap transformSubstitutionMap(SubstitutionMap subs) {
10561056
if (subs.empty())
10571057
return subs;
10581058

0 commit comments

Comments
 (0)