Sema: BindingSet::Literals can just be a vector and not a map

Author: slavapestov

include/swift/Sema/CSBindings.h

@@ -382,7 +382,7 @@ class BindingSet {
   /// Note that ordering is important when it comes to bindings, we'd
   /// like to add any "direct" default types first to attempt them
   /// before transitive ones.
-  llvm::SmallMapVector<ProtocolDecl *, LiteralRequirement, 2> Literals;
+  llvm::SmallVector<LiteralRequirement, 2> Literals;
 
   llvm::SmallVector<Constraint *, 2> Defaults;
 
@@ -465,7 +465,7 @@ class BindingSet {
     // Literal requirements always result in a subtype/supertype
     // relationship to a concrete type.
     if (llvm::any_of(Literals, [](const auto &literal) {
-          return literal.second.viableAsBinding();
+          return literal.viableAsBinding();
         }))
       return false;
 

lib/Sema/CSBindings.cpp

@@ -86,9 +86,12 @@ bool BindingSet::forGenericParameter() const {
 }
 
 bool BindingSet::canBeNil() const {
-  auto &ctx = CS.getASTContext();
-  return Literals.count(
-      ctx.getProtocol(KnownProtocolKind::ExpressibleByNilLiteral));
+  for (const auto &literal : Literals) {
+    if (literal.getProtocol()->isSpecificProtocol(
+        KnownProtocolKind::ExpressibleByNilLiteral))
+      return true;
+  }
+  return false;
 }
 
 bool BindingSet::isDirectHole() const {
@@ -652,7 +655,7 @@ void BindingSet::inferTransitiveSupertypeBindings() {
     // `ExpressibleByStringLiteral` conformance, we'd end up picking
     // `T` with only one type `Any?` which is incorrect.
     for (const auto &literal : bindings.Literals)
-      addLiteralRequirement(literal.second.getSource());
+      addLiteralRequirement(literal.getSource());
 
     // Infer transitive defaults.
     for (auto *def : bindings.Defaults) {
@@ -1002,9 +1005,7 @@ void BindingSet::determineLiteralCoverage() {
 
   bool allowsNil = canBeNil();
 
-  for (auto &entry : Literals) {
-    auto &literal = entry.second;
-
+  for (auto &literal : Literals) {
     if (!literal.viableAsBinding())
       continue;
 
@@ -1032,34 +1033,36 @@ void BindingSet::determineLiteralCoverage() {
 }
 
 void BindingSet::coalesceIntegerAndFloatLiteralRequirements() {
-  for (const auto &pair : Literals) {
-    auto *protocol = pair.first;
+  decltype(Literals)::iterator intLiteral = Literals.end();
+  decltype(Literals)::iterator floatLiteral = Literals.end();
+
+  for (auto iter = Literals.begin(); iter != Literals.end(); ++iter) {
+    auto *protocol = iter->getProtocol();
 
     if (protocol->isSpecificProtocol(
             KnownProtocolKind::ExpressibleByIntegerLiteral)) {
-      auto *floatLiteral = CS.getASTContext().getProtocol(
-          KnownProtocolKind::ExpressibleByFloatLiteral);
-      if (Literals.count(floatLiteral)) {
-        Literals.erase(protocol);
-        return;
-      }
+      intLiteral = iter;
     }
 
     if (protocol->isSpecificProtocol(
             KnownProtocolKind::ExpressibleByFloatLiteral)) {
-      auto *intLiteral = CS.getASTContext().getProtocol(
-          KnownProtocolKind::ExpressibleByIntegerLiteral);
-      Literals.erase(intLiteral);
-      return;
+      floatLiteral = iter;
     }
   }
+
+  if (intLiteral != Literals.end() &&
+      floatLiteral != Literals.end()) {
+    Literals.erase(intLiteral);
+  }
 }
 
 void BindingSet::addLiteralRequirement(Constraint *constraint) {
   auto *protocol = constraint->getProtocol();
 
-  if (Literals.count(protocol) > 0)
-    return;
+  for (const auto &literal : Literals) {
+    if (literal.getProtocol() == protocol)
+      return;
+  }
 
   bool isDirect = isDirectRequirement(CS, TypeVar, constraint);
 
@@ -1070,8 +1073,7 @@ void BindingSet::addLiteralRequirement(Constraint *constraint) {
     defaultType = TypeChecker::getDefaultType(protocol, CS.DC);
   }
 
-  LiteralRequirement literal(protocol, constraint, defaultType, isDirect);
-  Literals.insert({protocol, std::move(literal)});
+  Literals.emplace_back(protocol, constraint, defaultType, isDirect);
 }
 
 bool BindingSet::operator==(const BindingSet &other) {
@@ -1081,7 +1083,7 @@ bool BindingSet::operator==(const BindingSet &other) {
   if (Bindings.size() != other.Bindings.size())
     return false;
 
-  for (auto i : indices(Bindings)) {
+  for (unsigned i : indices(Bindings)) {
     const auto &x = Bindings[i];
     const auto &y = other.Bindings[i];
 
@@ -1093,13 +1095,9 @@ bool BindingSet::operator==(const BindingSet &other) {
   if (Literals.size() != other.Literals.size())
     return false;
 
-  for (auto pair : Literals) {
-    auto found = other.Literals.find(pair.first);
-    if (found == other.Literals.end())
-      return false;
-
-    const auto &x = pair.second;
-    const auto &y = found->second;
+  for (unsigned i : indices(Literals)) {
+    auto &x = Literals[i];
+    auto &y = other.Literals[i];
 
     if (x.Source != y.Source ||
         x.DefaultType.getPointer() != y.DefaultType.getPointer() ||
@@ -2324,15 +2322,12 @@ void PotentialBindings::dump(ConstraintSystem &cs, TypeVariableType *typeVar,
 
 void BindingSet::forEachLiteralRequirement(
     llvm::function_ref<void(KnownProtocolKind)> callback) const {
-  for (const auto &literal : Literals) {
-    auto *protocol = literal.first;
-    const auto &info = literal.second;
-
+  for (const auto &info : Literals) {
     // Only uncovered defaultable literal protocols participate.
     if (!info.viableAsBinding())
       continue;
 
-    if (auto protocolKind = protocol->getKnownProtocolKind())
+    if (auto protocolKind = info.getProtocol()->getKnownProtocolKind())
       callback(*protocolKind);
   }
 }
@@ -2363,7 +2358,7 @@ LiteralBindingKind BindingSet::getLiteralForScore() const {
 
 unsigned BindingSet::getNumViableLiteralBindings() const {
   return llvm::count_if(Literals, [&](const auto &literal) {
-    return literal.second.viableAsBinding();
+    return literal.viableAsBinding();
   });
 }
 
@@ -2501,10 +2496,10 @@ void BindingSet::dump(llvm::raw_ostream &out, unsigned indent) const {
   }
   for (const auto &literal : Literals) {
     potentialBindings.push_back(PrintableBinding::literalDefaultType(
-        literal.second.hasDefaultType()
-        ? literal.second.getDefaultType()
+        literal.hasDefaultType()
+        ? literal.getDefaultType()
         : Type(),
-        literal.second.viableAsBinding()));
+        literal.viableAsBinding()));
   }
   if (potentialBindings.empty()) {
     out << "<none>";

lib/Sema/CSOptimizer.cpp

@@ -1048,9 +1048,9 @@ static void determineBestChoicesInContext(
         }
 
         for (const auto &literal : bindingSet.Literals) {
-          if (literal.second.hasDefaultType()) {
+          if (literal.hasDefaultType()) {
             // Add primary default type
-            auto type = restoreOptionality(literal.second.getDefaultType(),
+            auto type = restoreOptionality(literal.getDefaultType(),
                                            optionals.size());
             types.push_back({type,
                              /*fromLiteral=*/true});

lib/Sema/CSSolver.cpp

@@ -2566,8 +2566,8 @@ void DisjunctionChoice::propagateConversionInfo(ConstraintSystem &cs) const {
     conversionType = bindings.Bindings[0].BindingType;
   } else {
     for (const auto &literal : bindings.Literals) {
-      if (literal.second.viableAsBinding()) {
-        conversionType = literal.second.getDefaultType();
+      if (literal.viableAsBinding()) {
+        conversionType = literal.getDefaultType();
         break;
       }
     }

lib/Sema/ConstraintSystem.cpp

@@ -5397,9 +5397,7 @@ TypeVarBindingProducer::TypeVarBindingProducer(const BindingSet &bindings)
   }
 
   // Infer defaults based on "uncovered" literal protocol requirements.
-  for (const auto &info : bindings.Literals) {
-    const auto &literal = info.second;
-
+  for (const auto &literal : bindings.Literals) {
     if (!literal.viableAsBinding())
       continue;
 

unittests/Sema/BindingInferenceTests.cpp

@@ -42,7 +42,7 @@ TEST_F(SemaTest, TestIntLiteralBindingInference) {
 
     ASSERT_EQ(bindings.Literals.size(), (unsigned)1);
 
-    const auto &literal = bindings.Literals.front().second;
+    const auto &literal = bindings.Literals.front();
 
     ASSERT_TRUE(literal.hasDefaultType());
     ASSERT_TRUE(literal.getDefaultType()->isEqual(intTy));
@@ -65,7 +65,7 @@ TEST_F(SemaTest, TestIntLiteralBindingInference) {
 
     ASSERT_TRUE(bindings.Bindings[0].BindingType->isEqual(intTy));
 
-    const auto &literal = bindings.Literals.front().second;
+    const auto &literal = bindings.Literals.front();
     ASSERT_TRUE(literal.isCovered());
     ASSERT_TRUE(literal.isDirectRequirement());
     ASSERT_TRUE(literal.getDefaultType()->isEqual(intTy));
@@ -99,7 +99,7 @@ TEST_F(SemaTest, TestIntLiteralBindingInference) {
 
     ASSERT_TRUE(bindings.Bindings[0].BindingType->isEqual(floatTy));
 
-    const auto &literal = bindings.Literals.front().second;
+    const auto &literal = bindings.Literals.front();
     ASSERT_TRUE(literal.isCovered());
     ASSERT_TRUE(literal.isDirectRequirement());
     ASSERT_FALSE(literal.getDefaultType()->isEqual(floatTy));
@@ -140,7 +140,7 @@ TEST_F(SemaTest, TestIntLiteralBindingInference) {
     // Inferred literal requirement through `$T_float` as well.
     ASSERT_EQ(bindings.Literals.size(), (unsigned)1);
 
-    const auto &literal = bindings.Literals.front().second;
+    const auto &literal = bindings.Literals.front();
 
     ASSERT_TRUE(literal.isCovered());
     ASSERT_FALSE(literal.isDirectRequirement());