IRGen: Fix createExistentialTypeInfo() for compositions involving ParameterizedProtocolType

Author: slavapestov

lib/IRGen/GenExistential.cpp

@@ -1520,22 +1520,18 @@ static const TypeInfo *createExistentialTypeInfo(IRGenModule &IGM, CanType T) {
   }
 
   llvm::StructType *type;
-  if (T->hasParameterizedExistential()) {
-    type = IGM.createNominalType(T);
-  } else {
-    // Note: Protocol composition types are not nominal, but we name them
-    // anyway.
-    if (auto existential = T->getAs<ExistentialType>()) {
-      T = existential->getConstraintType()->getCanonicalType();
-    }
 
-    if (isa<ProtocolType>(T))
-      type = IGM.createNominalType(T);
-    else
-      type =
-          IGM.createNominalType(cast<ProtocolCompositionType>(T.getPointer()));
+  // Note: Protocol composition types are not nominal, but we name them
+  // anyway.
+  if (auto existential = T->getAs<ExistentialType>()) {
+    T = existential->getConstraintType()->getCanonicalType();
   }
 
+  if (isa<ProtocolType>(T) || isa<ParameterizedProtocolType>(T))
+    type = IGM.createNominalType(T);
+  else
+    type = IGM.createNominalType(cast<ProtocolCompositionType>(T.getPointer()));
+
   assert(type->isOpaque() && "creating existential type in concrete struct");
 
   // In an opaque metadata, the first two fields are the fixed buffer