More cleanups in argument vector, per comments.

Author: b-pass

include/pybind11/detail/argument_vector.h

@@ -165,25 +165,23 @@ struct small_vector {
         return m_repr.hvector.vec[idx];
     }
 
-    void push_back(T x) {
+    void push_back(T const &x) { emplace_back(x); }
+
+    template <typename... Args>
+    void emplace_back(Args &&...x) {
         if (is_inline()) {
             auto &ha = m_repr.iarray;
             if (ha.size == InlineSize) {
                 move_to_heap_vector_with_reserved_size(InlineSize + 1);
-                push_back_slow_path(std::move(x));
+                m_repr.hvector.vec.emplace_back(std::forward<Args>(x)...);
             } else {
-                ha.arr[ha.size++] = std::move(x);
+                ha.arr[ha.size++] = T(std::forward<Args>(x)...);
             }
         } else {
-            push_back_slow_path(std::move(x));
+            m_repr.hvector.vec.emplace_back(std::forward<Args>(x)...);
         }
     }
 
-    template <typename Arg>
-    void emplace_back(Arg &&x) {
-        push_back(T(x));
-    }
-
     void reserve(std::size_t sz) {
         if (is_inline()) {
             if (sz > InlineSize) {
@@ -194,19 +192,6 @@ struct small_vector {
         }
     }
 
-    void sort() {
-        if (is_inline()) {
-            if (m_repr.iarray.size < m_repr.iarray.arr.size()) {
-                std::sort(m_repr.iarray.arr.begin(),
-                          m_repr.iarray.arr.begin() + m_repr.iarray.size);
-            } else {
-                std::sort(m_repr.iarray.arr.begin(), m_repr.iarray.arr.end());
-            }
-        } else {
-            std::sort(m_repr.hvector.vec.begin(), m_repr.hvector.vec.end());
-        }
-    }
-
 private:
     using repr_type = inline_array_or_vector<T, InlineSize>;
     repr_type m_repr;
@@ -225,8 +210,6 @@ struct small_vector {
         new (&m_repr.hvector) heap_vector(std::move(hv));
     }
 
-    PYBIND11_NOINLINE void push_back_slow_path(T x) { m_repr.hvector.vec.push_back(std::move(x)); }
-
     PYBIND11_NOINLINE void reserve_slow_path(std::size_t sz) { m_repr.hvector.vec.reserve(sz); }
 
     bool is_inline() const { return m_repr.is_inline(); }
@@ -303,6 +286,23 @@ struct small_vector<bool, kRequestedInlineSize> {
         }
     }
 
+    void set(std::size_t idx, bool value = true) {
+        if (is_inline()) {
+            auto &ha = m_repr.iarray;
+            assert(ha.size < kInlineSize);
+            const auto wbi = word_and_bit_index(idx);
+            assert(wbi.word < kWords);
+            assert(wbi.bit < kBitsPerWord);
+            if (value) {
+                ha.arr[wbi.word] |= (static_cast<std::size_t>(1) << wbi.bit);
+            } else {
+                ha.arr[wbi.word] &= ~(static_cast<std::size_t>(1) << wbi.bit);
+            }
+        } else {
+            m_repr.hvector.vec[idx] = value;
+        }
+    }
+
     void swap(small_vector &rhs) noexcept { std::swap(m_repr, rhs.m_repr); }
 
 private: