Verify that select_on_container_copy_construction is being used app…

…ropriately
gharveymn · Dec 8, 2024 · 7f5ed74 · 7f5ed74
1 parent b9bd703
commit 7f5ed74
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 1 deletion.
diff --git a/source/test/test_allocators.hpp b/source/test/test_allocators.hpp
@@ -399,7 +399,8 @@ namespace gch
       template <typename U>
       constexpr GCH_IMPLICIT_CONVERSION
       verifying_allocator (const verifying_allocator<U, PartialTraits>& other) noexcept
-        : base (other)
+        : base (other),
+          created_by_container_copy_construction (other.created_by_container_copy_construction)
       { }
 
       GCH_NODISCARD
@@ -452,8 +453,53 @@ namespace gch
         remove_object (p);
         alloc_traits::destroy (*this, p);
       }
+
+      verifying_allocator
+      select_on_container_copy_construction () const
+      {
+        verifying_allocator ret (*this);
+        ret.created_by_container_copy_construction = true;
+        return ret;
+      }
+
+      bool created_by_container_copy_construction = false;
     };
 
+    namespace detail {
+
+    }
+    template <typename A>
+    constexpr int
+    verify_created_by_container_copy_construction (const A&)
+    {
+      return 0;
+    }
+
+    template <typename T, typename Traits>
+    constexpr int
+    verify_created_by_container_copy_construction (const verifying_allocator<T, Traits>& a)
+    {
+      assert (a.created_by_container_copy_construction
+          &&  "select_on_container_copy_construction unexpectedly invoked");
+      return 0;
+    }
+
+    template <typename A>
+    constexpr int
+    verify_not_created_by_container_copy_construction (const A&)
+    {
+      return 0;
+    }
+
+    template <typename T, typename Traits>
+    constexpr int
+    verify_not_created_by_container_copy_construction (const verifying_allocator<T, Traits>& a)
+    {
+      assert (! a.created_by_container_copy_construction
+          &&  "select_on_container_copy_construction unexpectedly not invoked");
+      return 0;
+    }
+
     template <typename T, typename Traits>
     constexpr
     bool

diff --git a/source/test/unit/member/assign/test-copy.cpp b/source/test/unit/member/assign/test-copy.cpp
@@ -211,6 +211,7 @@ struct tester
 
       n.assign (m);
       CHECK (n == m_cmp);
+      gch::test_types::verify_not_created_by_container_copy_construction (n.get_allocator ());
     }
     {
       // vector_type<N> (ni) -> vector_type<M> (mi)
@@ -222,6 +223,7 @@ struct tester
 
       m.assign (n);
       CHECK (m == n_cmp);
+      gch::test_types::verify_not_created_by_container_copy_construction (m.get_allocator ());
     }
     {
       // vector_type<M> (ni) -> vector_type<N> (mi)
@@ -233,6 +235,7 @@ struct tester
 
       n.assign (m);
       CHECK (n == n_cmp);
+      gch::test_types::verify_not_created_by_container_copy_construction (n.get_allocator ());
     }
     {
       // vector_type<N> (mi) -> vector_type<M> (ni)
@@ -244,6 +247,7 @@ struct tester
 
       m.assign (n);
       CHECK (m == m_cmp);
+      gch::test_types::verify_not_created_by_container_copy_construction (m.get_allocator ());
     }
   }
 

diff --git a/source/test/unit/member/assign/test-move.cpp b/source/test/unit/member/assign/test-move.cpp
@@ -318,6 +318,7 @@ struct tester
 
       n.assign (std::move (m));
       CHECK (n == m_cmp);
+      gch::test_types::verify_not_created_by_container_copy_construction (n.get_allocator ());
     }
     {
       // vector_type<N> (ni) -> vector_type<M> (mi)
@@ -329,6 +330,7 @@ struct tester
 
       m.assign (std::move (n));
       CHECK (m == n_cmp);
+      gch::test_types::verify_not_created_by_container_copy_construction (m.get_allocator ());
     }
     {
       // vector_type<M> (ni) -> vector_type<N> (mi)
@@ -340,6 +342,7 @@ struct tester
 
       n.assign (std::move (m));
       CHECK (n == n_cmp);
+      gch::test_types::verify_not_created_by_container_copy_construction (n.get_allocator ());
     }
     {
       // vector_type<N> (mi) -> vector_type<M> (ni)
@@ -351,6 +354,7 @@ struct tester
 
       m.assign (std::move (n));
       CHECK (m == m_cmp);
+      gch::test_types::verify_not_created_by_container_copy_construction (m.get_allocator ());
     }
   }
 

diff --git a/source/test/unit/member/constructor/test-copy.cpp b/source/test/unit/member/constructor/test-copy.cpp
@@ -118,13 +118,15 @@ struct tester
 
       vector_type<N> v (m);
       CHECK (v == m_cmp);
+      gch::test_types::verify_created_by_container_copy_construction (v.get_allocator ());
     }
     {
       vector_type<M> m (mi.begin (), mi.end (), m_alloc);
       mi (m);
 
       vector_type<N> v (m, m_alloc);
       CHECK (v == m_cmp);
+      gch::test_types::verify_not_created_by_container_copy_construction (v.get_allocator ());
     }
   }
 

diff --git a/source/test/unit/member/constructor/test-move.cpp b/source/test/unit/member/constructor/test-move.cpp
@@ -119,13 +119,15 @@ struct tester
 
       vector_type<N> v (std::move (m));
       CHECK (v == m_cmp);
+      gch::test_types::verify_not_created_by_container_copy_construction (v.get_allocator ());
     }
     {
       vector_type<M> m (mi.begin (), mi.end (), m_alloc);
       mi (m);
 
       vector_type<N> v (std::move (m), m_init_alloc);
       CHECK (v == m_cmp);
+      gch::test_types::verify_not_created_by_container_copy_construction (v.get_allocator ());
     }
   }
 

diff --git a/source/test/unit/member/constructor/test-range.cpp b/source/test/unit/member/constructor/test-range.cpp
@@ -130,6 +130,7 @@ struct tester
     {
       vector_type<N> v (mi.begin (), mi.end (), m_alloc);
       CHECK (mi.size () == v.size () && std::equal (mi.begin (), mi.end (), v.begin ()));
+      gch::test_types::verify_not_created_by_container_copy_construction (v.get_allocator ());
     }
     {
       vector_type<N> v (input_it (&*mi.begin ()), input_it (&*mi.end ()));
@@ -138,6 +139,7 @@ struct tester
     {
       vector_type<N> v (input_it (&*mi.begin ()), input_it (&*mi.end ()), m_alloc);
       CHECK (mi.size () == v.size () && std::equal (mi.begin (), mi.end (), v.begin ()));
+      gch::test_types::verify_not_created_by_container_copy_construction (v.get_allocator ());
     }
     {
       vector_type<N> v (forward_it (&*mi.begin ()), forward_it (&*mi.end ()));
@@ -146,6 +148,7 @@ struct tester
     {
       vector_type<N> v (forward_it (&*mi.begin ()), forward_it (&*mi.end ()), m_alloc);
       CHECK (mi.size () == v.size () && std::equal (mi.begin (), mi.end (), v.begin ()));
+      gch::test_types::verify_not_created_by_container_copy_construction (v.get_allocator ());
     }
   }
 

diff --git a/source/test/unit/member/swap/test.cpp b/source/test/unit/member/swap/test.cpp
@@ -122,6 +122,8 @@ struct tester
       n.swap (m);
       CHECK (n == m_cmp);
       CHECK (m == n_cmp);
+      gch::test_types::verify_not_created_by_container_copy_construction (n.get_allocator ());
+      gch::test_types::verify_not_created_by_container_copy_construction (m.get_allocator ());
     }
     {
       // vector_type<N> (ni) -> vector_type<N> (mi)
@@ -134,6 +136,8 @@ struct tester
       m.swap (n);
       CHECK (n == m_cmp);
       CHECK (m == n_cmp);
+      gch::test_types::verify_not_created_by_container_copy_construction (n.get_allocator ());
+      gch::test_types::verify_not_created_by_container_copy_construction (m.get_allocator ());
     }
   }