aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2023-06-08 12:19:26 +0100
committerJonathan Wakely <jwakely@redhat.com>2023-06-09 09:55:42 +0100
commit3ec1d76a359542ed4c8370390efa9ee9e25e757f (patch)
tree805bde8dbc03abc3918044d8446e2702f7ee01c9
parentcb33116afc2da3024cffdeed5d90b69c3820017b (diff)
downloadgcc-3ec1d76a359542ed4c8370390efa9ee9e25e757f.zip
gcc-3ec1d76a359542ed4c8370390efa9ee9e25e757f.tar.gz
gcc-3ec1d76a359542ed4c8370390efa9ee9e25e757f.tar.bz2
libstdc++: Improve tests for emplace member of sequence containers
Our existing tests for std::deque::emplace, std::list::emplace and std::vector::emplace are poor. We only have compile tests for PR 52799 and the equivalent for a const_iterator as the insertion point. This fails to check that the value is actually inserted correctly and the right iterator is returned. Add new tests that cover the existing 52799.cc and const_iterator.cc compile-only tests, as well as verifying the effects are correct. libstdc++-v3/ChangeLog: * testsuite/23_containers/deque/modifiers/emplace/52799.cc: Removed. * testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc: Removed. * testsuite/23_containers/list/modifiers/emplace/52799.cc: Removed. * testsuite/23_containers/list/modifiers/emplace/const_iterator.cc: Removed. * testsuite/23_containers/vector/modifiers/emplace/52799.cc: Removed. * testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc: Removed. * testsuite/23_containers/deque/modifiers/emplace/1.cc: New test. * testsuite/23_containers/list/modifiers/emplace/1.cc: New test. * testsuite/23_containers/vector/modifiers/emplace/1.cc: New test.
-rw-r--r--libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/1.cc70
-rw-r--r--libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/52799.cc27
-rw-r--r--libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc26
-rw-r--r--libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/1.cc71
-rw-r--r--libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/52799.cc27
-rw-r--r--libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/const_iterator.cc26
-rw-r--r--libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/1.cc70
-rw-r--r--libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/52799.cc27
-rw-r--r--libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc26
9 files changed, 211 insertions, 159 deletions
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/1.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/1.cc
new file mode 100644
index 0000000..c6b0318
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/1.cc
@@ -0,0 +1,70 @@
+// { dg-do run { target c++11 } }
+
+#include <deque>
+#include <testsuite_hooks.h>
+
+void
+test01()
+{
+ std::deque<int> c;
+ std::deque<int>::iterator pos;
+
+ // libstdc++/52799
+ pos = c.emplace(c.begin());
+ VERIFY( c.size() == 1 );
+ VERIFY( c[0] == 0 );
+ VERIFY( pos == c.begin() );
+ pos = c.emplace(c.begin(), 2);
+ VERIFY( c.size() == 2 );
+ VERIFY( c[0] == 2 );
+ VERIFY( c[1] == 0 );
+ VERIFY( pos == c.begin() );
+ pos = c.emplace(c.end(), 3);
+ VERIFY( c.size() == 3 );
+ VERIFY( c[0] == 2 );
+ VERIFY( c[1] == 0 );
+ VERIFY( c[2] == 3 );
+ VERIFY( pos == --c.end() );
+
+ // const_iterator
+ pos = c.emplace(c.cbegin());
+ VERIFY( c.size() == 4 );
+ VERIFY( c[0] == 0 );
+ VERIFY( c[1] == 2 );
+ VERIFY( pos == c.cbegin() );
+ pos = c.emplace(c.cbegin() + 2, 22);
+ VERIFY( c.size() == 5 );
+ VERIFY( c[0] == 0 );
+ VERIFY( c[1] == 2 );
+ VERIFY( c[2] == 22 );
+ VERIFY( pos == c.cbegin() + 2 );
+}
+
+struct V
+{
+ explicit V(int a, int b = 0) : val(a+b) { }
+ int val;
+};
+
+void
+test02()
+{
+ std::deque<V> c;
+ std::deque<V>::iterator pos;
+
+ pos = c.emplace(c.end(), 1);
+ VERIFY( c.size() == 1 );
+ VERIFY( c[0].val == 1 );
+ VERIFY( pos == --c.end() );
+ pos = c.emplace(c.cend(), 2, 3);
+ VERIFY( c.size() == 2 );
+ VERIFY( c[0].val == 1 );
+ VERIFY( c[1].val == 5 );
+ VERIFY( pos == --c.cend() );
+}
+
+int main()
+{
+ test01();
+ test02();
+}
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/52799.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/52799.cc
deleted file mode 100644
index 0beebb5..0000000
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/52799.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-// { dg-do compile { target c++11 } }
-
-// Copyright (C) 2012-2023 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3. If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <deque>
-
-// libstdc++/52799
-int main()
-{
- std::deque<int> d;
- d.emplace(d.begin());
-}
diff --git a/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc b/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc
deleted file mode 100644
index 81d1614..0000000
--- a/libstdc++-v3/testsuite/23_containers/deque/modifiers/emplace/const_iterator.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// { dg-do compile { target c++11 } }
-
-// Copyright (C) 2013-2023 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3. If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <deque>
-
-void test01()
-{
- std::deque<int> d1;
- d1.emplace(d1.cbegin(), 1);
-}
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/1.cc b/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/1.cc
new file mode 100644
index 0000000..8f14c15
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/1.cc
@@ -0,0 +1,71 @@
+// { dg-do run { target c++11 } }
+
+#include <list>
+#include <testsuite_hooks.h>
+
+void
+test01()
+{
+ std::list<int> c;
+ std::list<int>::iterator pos;
+
+ // libstdc++/52799
+ pos = c.emplace(c.begin());
+ VERIFY( c.size() == 1 );
+ VERIFY( *pos == 0 );
+ VERIFY( pos == c.begin() );
+ pos = c.emplace(c.begin(), 2);
+ VERIFY( c.size() == 2 );
+ VERIFY( *pos == 2 );
+ VERIFY( pos == c.begin() );
+ VERIFY( *++pos == 0 );
+ pos = c.emplace(c.end(), 3);
+ VERIFY( c.size() == 3 );
+ VERIFY( *pos == 3 );
+ VERIFY( pos == --c.end() );
+ VERIFY( *--pos == 0 );
+ VERIFY( *--pos == 2 );
+
+ // const_iterator
+ pos = c.emplace(c.cbegin());
+ VERIFY( c.size() == 4 );
+ VERIFY( *pos == 0 );
+ VERIFY( pos == c.cbegin() );
+ VERIFY( *++pos == 2 );
+ std::list<int>::const_iterator i = std::next(c.cbegin(), 2);
+ pos = c.emplace(i, 22);
+ VERIFY( c.size() == 5 );
+ VERIFY( *pos == 22 );
+ VERIFY( pos == std::prev(i) );
+ VERIFY( *--pos == 2 );
+ VERIFY( *--pos == 0 );
+}
+
+struct V
+{
+ explicit V(int a, int b = 0) : val(a+b) { }
+ int val;
+};
+
+void
+test02()
+{
+ std::list<V> c;
+ std::list<V>::iterator pos;
+
+ pos = c.emplace(c.end(), 1);
+ VERIFY( c.size() == 1 );
+ VERIFY( pos->val == 1 );
+ VERIFY( pos == --c.end() );
+ pos = c.emplace(c.cend(), 2, 3);
+ VERIFY( c.size() == 2 );
+ VERIFY( pos->val == 5 );
+ VERIFY( pos == --c.cend() );
+ VERIFY( c.front().val == 1 );
+}
+
+int main()
+{
+ test01();
+ test02();
+}
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/52799.cc b/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/52799.cc
deleted file mode 100644
index 8b76832..0000000
--- a/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/52799.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-// { dg-do compile { target c++11 } }
-
-// Copyright (C) 2012-2023 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3. If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <list>
-
-// libstdc++/52799
-int main()
-{
- std::list<int> l;
- l.emplace(l.begin());
-}
diff --git a/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/const_iterator.cc b/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/const_iterator.cc
deleted file mode 100644
index 7e620b8..0000000
--- a/libstdc++-v3/testsuite/23_containers/list/modifiers/emplace/const_iterator.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// { dg-do compile { target c++11 } }
-
-// Copyright (C) 2013-2023 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3. If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <list>
-
-void test01()
-{
- std::list<int> l1;
- l1.emplace(l1.cbegin(), 1);
-}
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/1.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/1.cc
new file mode 100644
index 0000000..53f3ebe
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/1.cc
@@ -0,0 +1,70 @@
+// { dg-do run { target c++11 } }
+
+#include <vector>
+#include <testsuite_hooks.h>
+
+void
+test01()
+{
+ std::vector<int> c;
+ std::vector<int>::iterator pos;
+
+ // libstdc++/52799
+ pos = c.emplace(c.begin());
+ VERIFY( c.size() == 1 );
+ VERIFY( c[0] == 0 );
+ VERIFY( pos == c.begin() );
+ pos = c.emplace(c.begin(), 2);
+ VERIFY( c.size() == 2 );
+ VERIFY( c[0] == 2 );
+ VERIFY( c[1] == 0 );
+ VERIFY( pos == c.begin() );
+ pos = c.emplace(c.end(), 3);
+ VERIFY( c.size() == 3 );
+ VERIFY( c[0] == 2 );
+ VERIFY( c[1] == 0 );
+ VERIFY( c[2] == 3 );
+ VERIFY( pos == --c.end() );
+
+ // const_iterator
+ pos = c.emplace(c.cbegin());
+ VERIFY( c.size() == 4 );
+ VERIFY( c[0] == 0 );
+ VERIFY( c[1] == 2 );
+ VERIFY( pos == c.cbegin() );
+ pos = c.emplace(c.cbegin() + 2, 22);
+ VERIFY( c.size() == 5 );
+ VERIFY( c[0] == 0 );
+ VERIFY( c[1] == 2 );
+ VERIFY( c[2] == 22 );
+ VERIFY( pos == c.cbegin() + 2 );
+}
+
+struct V
+{
+ explicit V(int a, int b = 0) : val(a+b) { }
+ int val;
+};
+
+void
+test02()
+{
+ std::vector<V> c;
+ std::vector<V>::iterator pos;
+
+ pos = c.emplace(c.end(), 1);
+ VERIFY( c.size() == 1 );
+ VERIFY( c[0].val == 1 );
+ VERIFY( pos == --c.end() );
+ pos = c.emplace(c.cend(), 2, 3);
+ VERIFY( c.size() == 2 );
+ VERIFY( c[0].val == 1 );
+ VERIFY( c[1].val == 5 );
+ VERIFY( pos == --c.cend() );
+}
+
+int main()
+{
+ test01();
+ test02();
+}
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/52799.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/52799.cc
deleted file mode 100644
index d33c011..0000000
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/52799.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-// { dg-do compile { target c++11 } }
-
-// Copyright (C) 2012-2023 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3. If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <vector>
-
-// libstdc++/52799
-int main()
-{
- std::vector<int> v;
- v.emplace(v.begin());
-}
diff --git a/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc b/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc
deleted file mode 100644
index 6fc7e32..0000000
--- a/libstdc++-v3/testsuite/23_containers/vector/modifiers/emplace/const_iterator.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// { dg-do compile { target c++11 } }
-
-// Copyright (C) 2013-2023 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3. If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <vector>
-
-void test01()
-{
- std::vector<int> v1;
- v1.emplace(v1.cbegin(), 1);
-}