Merge pull request swiftlang#36156 from xedin/rdar-74723323

[CSBindings] Copy-initialize transitive protocols for equivalence class

Author: xedin

lib/Sema/CSBindings.cpp

@@ -252,11 +252,11 @@ void BindingSet::inferTransitiveProtocolRequirements(
                    const SmallPtrSetImpl<Constraint *> &transitive) {
         auto &destination = protocols[dstVar];
 
-        for (auto *protocol : direct)
-          destination.insert(protocol);
+        if (direct.size() > 0)
+          destination.insert(direct.begin(), direct.end());
 
-        for (auto *protocol : transitive)
-          destination.insert(protocol);
+        if (transitive.size() > 0)
+          destination.insert(transitive.begin(), transitive.end());
       };
 
   addToWorkList(nullptr, TypeVar);
@@ -288,7 +288,7 @@ void BindingSet::inferTransitiveProtocolRequirements(
       addToWorkList(currentVar, entry.first);
 
     // If current type variable is part of an equivalence
-    // class, make it a "representative" and let's it infer
+    // class, make it a "representative" and let it infer
     // supertypes and direct protocol requirements from
     // other members.
     for (const auto &entry : bindings.Info.EquivalentTo) {
@@ -326,7 +326,7 @@ void BindingSet::inferTransitiveProtocolRequirements(
                            protocols[currentVar]);
     }
 
-    auto inferredProtocols = std::move(protocols[currentVar]);
+    auto &inferredProtocols = protocols[currentVar];
 
     llvm::SmallPtrSet<Constraint *, 4> protocolsForEquivalence;
 
@@ -350,13 +350,15 @@ void BindingSet::inferTransitiveProtocolRequirements(
       auto eqBindings = inferredBindings.find(equivalence.first);
       if (eqBindings != inferredBindings.end()) {
         auto &bindings = eqBindings->getSecond();
-        bindings.TransitiveProtocols.emplace(protocolsForEquivalence);
+        bindings.TransitiveProtocols.emplace(protocolsForEquivalence.begin(),
+                                             protocolsForEquivalence.end());
       }
     }
 
     // Update the bindings associated with current type variable,
     // to avoid repeating this inference process.
-    bindings.TransitiveProtocols.emplace(std::move(inferredProtocols));
+    bindings.TransitiveProtocols.emplace(inferredProtocols.begin(),
+                                         inferredProtocols.end());
   } while (!workList.empty());
 }