Fix

Author: angela-laar

include/swift/Sema/ConstraintSystem.h

@@ -5534,10 +5534,6 @@ Type typeEraseOpenedExistentialReference(Type type, Type existentialBaseType,
                                          TypeVariableType *openedTypeVar,
                                          TypePosition outermostPosition);
 
-Type transformFn(Type type, Type existentialBaseType,
-                            TypePosition initialPos);
-
-
 /// Returns true if a reference to a member on a given base type will apply
 /// its curried self parameter, assuming it has one.
 ///

lib/AST/GenericSignature.cpp

@@ -638,14 +638,13 @@ Type GenericSignatureImpl::getNonDependentUpperBounds(Type type) const {
   // If the class contains a type parameter that cannot be reduced,
   // try looking for a non-dependent superclass.
   if (Type superclass = getSuperclassBound(type)) {
-
     if (auto *boundgeneric = dyn_cast<BoundGenericClassType>(superclass)) {
 
       SmallVector<Type, 2> argTypes;
 
       while (superclass && superclass->hasTypeParameter()) {
 
-        // check if the current class has associated types
+        // check if the current class has generic arguments
         for (Type argTy : boundgeneric->getGenericArgs()) {
           argTypes.push_back(getReducedType(argTy));
         }
@@ -655,10 +654,10 @@ Type GenericSignatureImpl::getNonDependentUpperBounds(Type type) const {
         if (!boundgeneric->hasDependentMember() &&
             !boundgeneric->hasTypeParameter()) {
           superclass = boundgeneric;
-          /*RequiresCoercion = true;*/
           break;
         }
         superclass = superclass->getSuperclass();
+        // TO-DO: We should mark as 'requires coercion' if we have to erase to a non-dependent super type
       }
     }
 
@@ -732,7 +731,6 @@ Type GenericSignatureImpl::getNonDependentUpperBounds(Type type) const {
         continue;
       }
     }
-    // types.push_back(baseType);
     types.push_back(proto->getDeclaredInterfaceType());
   }
 

lib/Sema/CSFix.cpp

@@ -2496,7 +2496,6 @@ bool AddExplicitExistentialCoercion::isRequired(
         if (!existentialType)
           return Action::SkipChildren;
 
-        // let's grab the dependent upper bound here instead of nondependent
         auto erasedMemberTy = typeEraseOpenedExistentialReference(
             Type(member), *existentialType, typeVar, TypePosition::Covariant);
 
@@ -2562,7 +2561,6 @@ bool AddExplicitExistentialCoercion::isRequired(
         case RequirementKind::Layout: {
           if (isAnchoredOn(req.getFirstType(), member->getAssocType()))
             return true;
-          
           break;
         }