---

yaml
---
r: 348652
b: refs/heads/master
c: f90a501
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 051159f3b4e251d3cdf77c4209918911ec379565
+refs/heads/master: f90a501fc932cbed83d0de0c58d298d1523eceb4
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/ClangImporter/ImportType.cpp

@@ -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(