]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Fix std::vector<bool>::emplace to forward parameter
authorJonathan Wakely <jwakely@redhat.com>
Sat, 26 Oct 2024 20:24:58 +0000 (21:24 +0100)
committerJonathan Wakely <redi@gcc.gnu.org>
Sun, 27 Oct 2024 20:05:46 +0000 (20:05 +0000)
If the parameter is not lvalue-convertible to bool then the current code
will fail to compile. The parameter should be forwarded to restore the
original value category.

libstdc++-v3/ChangeLog:

* include/bits/stl_bvector.h (emplace_back, emplace): Forward
parameter pack to preserve value category.
* testsuite/23_containers/vector/bool/emplace_rvalue.cc: New
test.

libstdc++-v3/include/bits/stl_bvector.h
libstdc++-v3/testsuite/23_containers/vector/bool/emplace_rvalue.cc [new file with mode: 0644]

index 42261ac5915f22146789321c761606f287f515cc..70f69b5b5b55ee27acaec3bb847cf7c379353f1d 100644 (file)
@@ -1343,7 +1343,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
 #endif
        emplace_back(_Args&&... __args)
        {
-         push_back(bool(__args...));
+         push_back(bool(std::forward<_Args>(__args)...));
 #if __cplusplus > 201402L
          return back();
 #endif
@@ -1353,7 +1353,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
        _GLIBCXX20_CONSTEXPR
        iterator
        emplace(const_iterator __pos, _Args&&... __args)
-       { return insert(__pos, bool(__args...)); }
+       { return insert(__pos, bool(std::forward<_Args>(__args)...)); }
 #endif
 
     protected:
diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/emplace_rvalue.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/emplace_rvalue.cc
new file mode 100644 (file)
index 0000000..5dea242
--- /dev/null
@@ -0,0 +1,24 @@
+// { dg-do compile { target c++11 } }
+
+#include <vector>
+
+struct S
+{
+  explicit operator bool() &&;
+};
+
+void
+test_emplace_back()
+{
+  S s;
+  std::vector<bool> v;
+  v.emplace_back(std::move(s));
+}
+
+void
+test_emplace()
+{
+  S s;
+  std::vector<bool> v;
+  v.emplace(v.begin(), std::move(s));
+}