First half of C++17's splicing maps and sets

This commit adds a node handle type, (located in __node_handle), and adds
extract() and insert() members to all map and set types, as well as their
implementations in __tree and __hash_table.

The second half of this feature is adding merge() members, which splice nodes
in bulk from one container into another. This will be committed in a follow-up.

Differential revision: https://reviews.llvm.org/D46845

llvm-svn: 338472

4 files changed, 285 insertions, 0 deletions

diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_iterator.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_iterator.pass.cpp
new file mode 100644
index 00000000000..3e00d2b98d7
--- /dev/null
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_iterator.pass.cpp
@@ -0,0 +1,67 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++98, c++03, c++11, c++14
+
+// <map>
+
+// class multimap
+
+// node_type extract(const_iterator);
+
+#include <map>
+#include "min_allocator.h"
+#include "Counter.h"
+
+template <class Container>
+void test(Container& c)
+{
+    size_t sz = c.size();
+
+    auto some_key = c.cbegin()->first;
+
+    for (auto first = c.cbegin(); first != c.cend();)
+    {
+        auto key_value = first->first;
+        typename Container::node_type t = c.extract(first++);
+        --sz;
+        assert(t.key() == key_value);
+        t.key() = some_key;
+        assert(t.key() == some_key);
+        assert(t.get_allocator() == c.get_allocator());
+        assert(sz == c.size());
+    }
+
+    assert(c.size() == 0);
+}
+
+int main()
+{
+    {
+        using map_type = std::multimap<int, int>;
+        map_type m = {{1,1}, {2,2}, {3,3}, {4,4}, {5,5}, {6,6}};
+        test(m);
+    }
+
+    {
+        std::multimap<Counter<int>, Counter<int>> m =
+            {{1,1}, {2,2}, {3,3}, {4,4}, {5,5}, {6,6}};
+        assert(Counter_base::gConstructed == 12);
+        test(m);
+        assert(Counter_base::gConstructed == 0);
+    }
+
+    {
+        using min_alloc_map =
+            std::multimap<int, int, std::less<int>,
+                     min_allocator<std::pair<const int, int>>>;
+        min_alloc_map m = {{1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5}, {6, 6}};
+        test(m);
+    }
+}
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_key.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_key.pass.cpp
new file mode 100644
index 00000000000..ca69cca6b0e
--- /dev/null
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/extract_key.pass.cpp
@@ -0,0 +1,76 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++98, c++03, c++11, c++14
+
+// <map>
+
+// class multimap
+
+// node_type extract(key_type const&);
+
+#include <map>
+#include "min_allocator.h"
+#include "Counter.h"
+
+template <class Container, class KeyTypeIter>
+void test(Container& c, KeyTypeIter first, KeyTypeIter last)
+{
+    size_t sz = c.size();
+    assert((size_t)std::distance(first, last) == sz);
+
+    for (KeyTypeIter copy = first; copy != last; ++copy)
+    {
+        typename Container::node_type t = c.extract(*copy);
+        assert(!t.empty());
+        --sz;
+        assert(t.key() == *copy);
+        t.key() = *first; // We should be able to mutate key.
+        assert(t.key() == *first);
+        assert(t.get_allocator() == c.get_allocator());
+        assert(sz == c.size());
+    }
+
+    assert(c.size() == 0);
+
+    for (KeyTypeIter copy = first; copy != last; ++copy)
+    {
+        typename Container::node_type t = c.extract(*copy);
+        assert(t.empty());
+    }
+}
+
+int main()
+{
+    {
+        std::multimap<int, int> m = {{1,1}, {2,2}, {3,3}, {4,4}, {5,5}, {6,6}};
+        int keys[] = {1, 2, 3, 4, 5, 6};
+        test(m, std::begin(keys), std::end(keys));
+    }
+
+    {
+        std::multimap<Counter<int>, Counter<int>> m =
+            {{1,1}, {2,2}, {3,3}, {4,4}, {5,5}, {6,6}};
+        {
+            Counter<int> keys[] = {1, 2, 3, 4, 5, 6};
+            assert(Counter_base::gConstructed == 12+6);
+            test(m, std::begin(keys), std::end(keys));
+        }
+        assert(Counter_base::gConstructed == 0);
+    }
+
+    {
+        using min_alloc_map =
+            std::multimap<int, int, std::less<int>,
+                          min_allocator<std::pair<const int, int>>>;
+        min_alloc_map m = {{1, 1}, {2, 2}, {3, 3}, {4, 4}, {5, 5}, {6, 6}};
+        int keys[] = {1, 2, 3, 4, 5, 6};
+        test(m, std::begin(keys), std::end(keys));
+    }
+}
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_node_type.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_node_type.pass.cpp
new file mode 100644
index 00000000000..90677051419
--- /dev/null
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_node_type.pass.cpp
@@ -0,0 +1,78 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++98, c++03, c++11, c++14
+
+// <map>
+
+// class multimap
+
+// iterator insert(node_type&&);
+
+#include <map>
+#include <type_traits>
+#include "min_allocator.h"
+
+template <class Container>
+typename Container::node_type
+node_factory(typename Container::key_type const& key,
+             typename Container::mapped_type const& mapped)
+{
+    static Container c;
+    auto it = c.insert({key, mapped});
+    return c.extract(it);
+}
+
+template <class Container>
+void test(Container& c)
+{
+    auto* nf = &node_factory<Container>;
+
+    for (int i = 0; i != 10; ++i)
+    {
+        typename Container::node_type node = nf(i, i + 1);
+        assert(!node.empty());
+        typename Container::iterator it = c.insert(std::move(node));
+        assert(node.empty());
+        assert(it == c.find(i) && it != c.end());
+    }
+
+    assert(c.size() == 10);
+
+    { // Insert empty node.
+        typename Container::node_type def;
+        auto it = c.insert(std::move(def));
+        assert(def.empty());
+        assert(it == c.end());
+    }
+
+    { // Insert duplicate node.
+        typename Container::node_type dupl = nf(0, 42);
+        auto it = c.insert(std::move(dupl));
+        assert(dupl.empty());
+        assert(it != c.end());
+        assert(it->second == 42);
+    }
+
+    assert(c.size() == 11);
+    assert(c.count(0) == 2);
+    for (int i = 1; i != 10; ++i)
+    {
+        assert(c.count(i) == 1);
+        assert(c.find(i)->second == i + 1);
+    }
+}
+
+int main()
+{
+    std::multimap<int, int> m;
+    test(m);
+    std::multimap<int, int, std::less<int>, min_allocator<std::pair<const int, int>>> m2;
+    test(m2);
+}
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_node_type_hint.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_node_type_hint.pass.cpp
new file mode 100644
index 00000000000..82e7d80c06e
--- /dev/null
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_node_type_hint.pass.cpp
@@ -0,0 +1,64 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++98, c++03, c++11, c++14
+
+// <map>
+
+// class multimap
+
+// iterator insert(const_iterator hint, node_type&&);
+
+#include <map>
+#include "min_allocator.h"
+
+template <class Container>
+typename Container::node_type
+node_factory(typename Container::key_type const& key,
+             typename Container::mapped_type const& mapped)
+{
+    static Container c;
+    auto it = c.insert({key, mapped});
+    return c.extract(it);
+}
+
+template <class Container>
+void test(Container& c)
+{
+    auto* nf = &node_factory<Container>;
+
+    for (int i = 0; i != 10; ++i)
+    {
+        typename Container::node_type node = nf(i, i + 1);
+        assert(!node.empty());
+        size_t prev = c.size();
+        auto it = c.insert(c.end(), std::move(node));
+        assert(node.empty());
+        assert(prev + 1 == c.size());
+        assert(it == c.find(i));
+        assert(it->first == i);
+        assert(it->second == i + 1);
+    }
+
+    assert(c.size() == 10);
+
+    for (int i = 0; i != 10; ++i)
+    {
+        assert(c.count(i) == 1);
+        assert(c.find(i)->second == i + 1);
+    }
+}
+
+int main()
+{
+    std::multimap<int, int> m;
+    test(m);
+    std::multimap<int, int, std::less<int>, min_allocator<std::pair<const int, int>>> m2;
+    test(m2);
+}