Address review comment TypeBase::hasOpaqueArchetypePropertiesOrCases

Author: aschwaighofer

include/swift/SIL/TypeLowering.h

@@ -862,7 +862,7 @@ class TypeConverter {
 
   CanType getLoweredTypeOfGlobal(VarDecl *var);
 
-  bool hasOpaqueArchetypePropertiesOrCases(CanType ty);
+  bool hasOpaqueArchetypeOrPropertiesOrCases(CanType ty);
 
   /// Return the SILFunctionType for a native function value of the
   /// given type.

lib/AST/Type.cpp

@@ -4641,21 +4641,20 @@ Type TypeBase::openAnyExistentialType(OpenedArchetypeType *&opened) {
 }
 
 bool TypeBase::hasOpaqueArchetypePropertiesOrCases() {
-  if (hasOpaqueArchetype())
-    return true;
-
   if (auto *structDecl = getStructOrBoundGenericStruct()) {
     for (auto *field : structDecl->getStoredProperties()) {
-      auto fieldTy = field->getInterfaceType();
-      if (fieldTy->getCanonicalType()->hasOpaqueArchetypePropertiesOrCases())
+      auto fieldTy = field->getInterfaceType()->getCanonicalType();
+      if (fieldTy->hasOpaqueArchetype() ||
+          fieldTy->hasOpaqueArchetypePropertiesOrCases())
         return true;
     }
   }
 
   if (auto *enumDecl = getEnumOrBoundGenericEnum()) {
     for (auto *elt : enumDecl->getAllElements()) {
       auto eltType = elt->getInterfaceType();
-      if (eltType->getCanonicalType()->hasOpaqueArchetypePropertiesOrCases())
+      if (eltType->hasOpaqueArchetype() ||
+          eltType->getCanonicalType()->hasOpaqueArchetypePropertiesOrCases())
         return true;
     }
   }

lib/SIL/TypeLowering.cpp

@@ -1522,7 +1522,7 @@ TypeConverter::getSILFunctionType(TypeExpansionContext context,
       getLoweredRValueType(context, origType, substType));
 }
 
-bool TypeConverter::hasOpaqueArchetypePropertiesOrCases(CanType ty) {
+bool TypeConverter::hasOpaqueArchetypeOrPropertiesOrCases(CanType ty) {
   if (ty->hasOpaqueArchetype())
     return true;
 
@@ -1541,14 +1541,13 @@ TypeConverter::getTypeLowering(AbstractionPattern origType,
                                TypeExpansionContext forExpansion) {
   CanType substType = origSubstType->getCanonicalType();
   auto origHadOpaqueTypeArchetype =
-      origSubstType->hasOpaqueArchetype() ||
-      hasOpaqueArchetypePropertiesOrCases(origSubstType->getCanonicalType());
+      hasOpaqueArchetypeOrPropertiesOrCases(origSubstType->getCanonicalType());
   auto key = getTypeKey(origType, substType, forExpansion);
   assert((!key.isDependent() || getCurGenericContext())
          && "dependent type outside of generic context?!");
   assert(!substType->is<InOutType>());
 
-  auto *candidateLowering = find(key);
+  auto *candidateLowering = find(key.getKeyForMinimalExpansion());
   auto *lowering = getTypeLoweringForExpansion(
       key, forExpansion, candidateLowering, origHadOpaqueTypeArchetype);
   if (lowering != nullptr)
@@ -1741,8 +1740,7 @@ TypeConverter::getTypeLowering(SILType type,
                         loweredType, forExpansion);
 
   auto origHadOpaqueTypeArchetype =
-      loweredType->hasOpaqueArchetype() ||
-      hasOpaqueArchetypePropertiesOrCases(loweredType);
+      hasOpaqueArchetypeOrPropertiesOrCases(loweredType);
 
   return getTypeLoweringForLoweredType(key, forExpansion,
                                        origHadOpaqueTypeArchetype);