AST: Replace SubstitutionMap::hasOpenedExistential() with SubstitutionMap::hasLocalArchetypes() and actually use it

Author: slavapestov

include/swift/AST/SubstitutionMap.h

@@ -168,7 +168,7 @@ class SubstitutionMap {
 
   /// Query whether any replacement types in the map contain an opened
   /// existential.
-  bool hasOpenedExistential() const;
+  bool hasLocalArchetypes() const;
 
   /// Query whether any replacement types in the map contain dynamic Self.
   bool hasDynamicSelf() const;

include/swift/SIL/SILCloner.h

@@ -192,15 +192,12 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
     // If we have local archetypes to substitute, check whether that's
     // relevant to this particular substitution.
     if (!LocalArchetypeSubs.empty()) {
-      for (auto ty : Subs.getReplacementTypes()) {
+      if (Subs.hasLocalArchetypes()) {
         // If we found a type containing a local archetype, substitute
         // open existentials throughout the substitution map.
-        if (ty->hasLocalArchetype()) {
-          Subs = Subs.subst(QueryTypeSubstitutionMapOrIdentity{
-                              LocalArchetypeSubs},
-                            MakeAbstractConformanceForGenericType());
-          break;
-        }
+        Subs = Subs.subst(QueryTypeSubstitutionMapOrIdentity{
+                            LocalArchetypeSubs},
+                          MakeAbstractConformanceForGenericType());
       }
     }
 

lib/AST/SubstitutionMap.cpp

@@ -132,9 +132,9 @@ bool SubstitutionMap::hasArchetypes() const {
   return false;
 }
 
-bool SubstitutionMap::hasOpenedExistential() const {
+bool SubstitutionMap::hasLocalArchetypes() const {
   for (Type replacementTy : getReplacementTypesBuffer()) {
-    if (replacementTy && replacementTy->hasOpenedExistential())
+    if (replacementTy && replacementTy->hasLocalArchetype())
       return true;
   }
   return false;