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

Sema: Replace some getGenericParamsOfContext() calls with isGenericContext()

Browse Source
This commit is contained in:
Slava Pestov
2016-12-01 18:30:31 -08:00
parent b4d11338ec
commit 26c80420d1
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Sema/CSDiag.cpp
View File

@@ -1202,7 +1202,7 @@ static bool findGenericSubstitutions(DeclContext *dc, Type paramType,
bool mismatch(SubstitutableType *paramType, TypeBase *argType) {
Type type = paramType;
if (dc && dc->getGenericParamsOfContext() && type->isTypeParameter())
if (dc && dc->isGenericContext() && type->isTypeParameter())
type = ArchetypeBuilder::mapTypeIntoContext(dc, paramType);
if (auto archetype = type->getAs<ArchetypeType>()) {
@@ -1339,7 +1339,7 @@ CalleeCandidateInfo::evaluateCloseness(DeclContext *dc, Type candArgListType,
matchType.findIf([&](Type type) -> bool {
if (auto substitution = dyn_cast<SubstitutedType>(type.getPointer())) {
Type original = substitution->getOriginal();
if (dc && dc->getGenericParamsOfContext() && original->isTypeParameter())
if (dc && dc->isGenericContext() && original->isTypeParameter())
original = ArchetypeBuilder::mapTypeIntoContext(dc, original);
Type replacement = substitution->getReplacementType();