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

Use isGenericContext instead of getGenericParamsOfContext where possible.

Browse Source
This commit is contained in:
Joe Groff
2016-03-25 09:55:06 -07:00
parent bd97722931
commit f443fb105c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ClangImporter/ImportDecl.cpp
View File

@@ -3123,7 +3123,7 @@ namespace {
if (auto proto = dyn_cast<ProtocolDecl>(dc)) {
std::tie(type, interfaceType)
= getProtocolMethodType(proto, type->castTo<AnyFunctionType>());
} else if (dc->getGenericParamsOfContext()) {
} else if (dc->isGenericContext()) {
std::tie(type, interfaceType)
= getGenericMethodType(dc, type->castTo<AnyFunctionType>());
selfVar->overwriteType(type->castTo<AnyFunctionType>()->getInput());
@@ -3579,7 +3579,7 @@ namespace {
result->setInitializerInterfaceType(interfaceInitType);
result->setInterfaceType(interfaceAllocType);
} else if (dc->getGenericParamsOfContext()) {
} else if (dc->isGenericContext()) {
Type interfaceAllocType;
Type interfaceInitType;
std::tie(allocType, interfaceAllocType)
@@ -3752,7 +3752,7 @@ namespace {
if (dc->getAsProtocolOrProtocolExtensionContext()) {
std::tie(getterType, interfaceType)
= getProtocolMethodType(dc, getterType->castTo<AnyFunctionType>());
} else if (dc->getGenericParamsOfContext()) {
} else if (dc->isGenericContext()) {
std::tie(getterType, interfaceType)
= getGenericMethodType(dc, getterType->castTo<AnyFunctionType>());
getterArgs[0]->get(0)->overwriteType(
@@ -3822,7 +3822,7 @@ namespace {
if (dc->getAsProtocolOrProtocolExtensionContext()) {
std::tie(setterType, interfaceType)
= getProtocolMethodType(dc, setterType->castTo<AnyFunctionType>());
} else if (dc->getGenericParamsOfContext()) {
} else if (dc->isGenericContext()) {
std::tie(setterType, interfaceType)
= getGenericMethodType(dc, setterType->castTo<AnyFunctionType>());
selfDecl->overwriteType(