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

Merge remote-tracking branch 'origin/master' into master-rebranch

Browse Source
This commit is contained in:
swift-ci
2019-09-24 19:43:46 -07:00
parent 051159f3b4 88bc5b8bf5
commit f90a501fc9
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/ClangImporter/ImportType.cpp
View File

@@ -891,20 +891,23 @@ namespace {
unsigned typeParamCount = imported->getGenericParams()->size();
auto typeArgs = type->getObjectType()->getTypeArgs();
assert(typeArgs.empty() || typeArgs.size() == typeParamCount);
llvm::SmallVector<Type, 2> importedTypeArgs;
for (unsigned i = 0; i < typeParamCount; i++) {
Type importedTypeArg;
auto typeParam = imported->getGenericParams()->getParams()[i];
if (!typeArgs.empty()) {
auto subresult = Visit(typeArgs[i]);
if (!subresult) {
SmallVector<Type, 2> importedTypeArgs;
importedTypeArgs.reserve(typeParamCount);
if (!typeArgs.empty()) {
for (auto typeArg : typeArgs) {
Type importedTypeArg = Visit(typeArg).AbstractType;
if (!importedTypeArg)
return nullptr;
importedTypeArgs.push_back(importedTypeArg);
}
} else {
for (auto typeParam : imported->getGenericParams()->getParams()) {
if (typeParam->getSuperclass() &&
typeParam->getConformingProtocols().empty()) {
importedTypeArgs.push_back(typeParam->getSuperclass());
continue;
}
importedTypeArg = subresult.AbstractType;
} else if (typeParam->getSuperclass() &&
typeParam->getConformingProtocols().empty()) {
importedTypeArg = typeParam->getSuperclass();
} else {
SmallVector<Type, 4> memberTypes;
if (auto superclassType = typeParam->getSuperclass())
@@ -917,11 +920,11 @@ namespace {
if (memberTypes.empty())
hasExplicitAnyObject = true;
importedTypeArg = ProtocolCompositionType::get(
Type importedTypeArg = ProtocolCompositionType::get(
Impl.SwiftContext, memberTypes,
hasExplicitAnyObject);
importedTypeArgs.push_back(importedTypeArg);
}
importedTypeArgs.push_back(importedTypeArg);
}
assert(importedTypeArgs.size() == typeParamCount);
importedType = BoundGenericClassType::get(