diff mbox

Get rid of move_iterator in debug checks

Message ID 5599A03E.1050200@gmail.com
State New
Headers show

Commit Message

François Dumont July 5, 2015, 9:23 p.m. UTC 
Hi

    I would like to restore foreign iterator check even when
move_iterator are being use. To do so I leverage on __miter_base to get
rid of move_iterator layer before running the check. I had to expose
__miter_base fallback implementation in cpp_type_traits.h to safely use
it in debug mode.

2015-07-05  François Dumont  <fdumont@gcc.gnu.org>

    * include/bits/stl_algobase.h (__miter_base): Move...
    * include/bits/cpp_type_traits.h: ...here.
    * include/debug/functions.h (__foreign_iterator_aux): Use latter.
    * testsuite/23_containers/vector/debug/insert7_neg.cc: New.

Tested undex linux x86_64.

Ok ?

François

Comments

Jonathan Wakely July 6, 2015, 2:55 p.m. UTC | #1 
On 05/07/15 23:23 +0200, François Dumont wrote:
>Ok ?

Yes, OK, thanks.
diff mbox

Patch

diff --git libstdc++-v3/include/bits/cpp_type_traits.h libstdc++-v3/include/bits/cpp_type_traits.h
index f7b76bf..b66b61f 100644
--- libstdc++-v3/include/bits/cpp_type_traits.h
+++ libstdc++-v3/include/bits/cpp_type_traits.h
@@ -399,6 +399,13 @@  __INT_N(__GLIBCXX_TYPE_INT_N_3)
       typedef __false_type __type;
     };
 
+  // Fallback implementation of the function in bits/stl_iterator.h used to
+  // remove the move_iterator wrapper.
+  template<typename _Iterator>
+    inline _Iterator
+    __miter_base(_Iterator __it)
+    { return __it; }
+
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace
 
diff --git libstdc++-v3/include/bits/stl_algobase.h libstdc++-v3/include/bits/stl_algobase.h
index b737fd0..f05e5cd 100644
--- libstdc++-v3/include/bits/stl_algobase.h
+++ libstdc++-v3/include/bits/stl_algobase.h
@@ -277,12 +277,6 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION
     __niter_base(_Iterator __it)
     { return __it; }
 
-  // Likewise for move_iterator.
-  template<typename _Iterator>
-    inline _Iterator
-    __miter_base(_Iterator __it)
-    { return __it; }
-
   // All of these auxiliary structs serve two purposes.  (1) Replace
   // calls to copy with memmove whenever possible.  (Memmove, not memcpy,
   // because the input and output ranges are permitted to overlap.)
diff --git libstdc++-v3/include/debug/functions.h libstdc++-v3/include/debug/functions.h
index e15f285..023758f 100644
--- libstdc++-v3/include/debug/functions.h
+++ libstdc++-v3/include/debug/functions.h
@@ -198,7 +198,8 @@  namespace __gnu_debug
 			   std::__false_type)
     {
       return _Insert_range_from_self_is_safe<_Sequence>::__value
-	     || __foreign_iterator_aux2(__it, __other, __other_end);
+	|| __foreign_iterator_aux2(__it, std::__miter_base(__other),
+				   std::__miter_base(__other_end));
     }
 
   template<typename _Iterator, typename _Sequence,
diff --git libstdc++-v3/testsuite/23_containers/vector/debug/insert7_neg.cc libstdc++-v3/testsuite/23_containers/vector/debug/insert7_neg.cc
new file mode 100644
index 0000000..eef427f
--- /dev/null
+++ libstdc++-v3/testsuite/23_containers/vector/debug/insert7_neg.cc
@@ -0,0 +1,44 @@ 
+// -*- C++ -*-
+
+// Copyright (C) 2015 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/>.
+
+// { dg-options "-std=gnu++11" }
+// { dg-do run { xfail *-*-* } }
+
+#include <memory>
+#include <iterator>
+#include <debug/vector>
+
+void
+test01()
+{
+  __gnu_debug::vector<std::unique_ptr<int>> v;
+
+  v.emplace_back(new int(0));
+  v.emplace_back(new int(1));
+
+  v.insert(begin(v) + 1,
+	   make_move_iterator(begin(v)),
+	   make_move_iterator(end(v)));
+}
+
+int
+main()
+{
+  test01();
+}