[libcxx] Qualify make_move_iterator in vector::insert for input iterators
Unqualified calls to make_move_iterator in the vector::insert overload
for input iterators lead to ADL issues: https://gcc.godbolt.org/z/bmcNbh
Patch by Logan Smith.
Differential Revision: https://reviews.llvm.org/D74290
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 9fda213d625a1f39954a8ba5311e1483d9d0db3e
diff --git a/include/vector b/include/vector
index 8366bb5..af96bff 100644
--- a/include/vector
+++ b/include/vector
@@ -1956,8 +1956,8 @@
#endif // _LIBCPP_NO_EXCEPTIONS
}
__p = _VSTD::rotate(__p, __old_last, this->__end_);
- insert(__make_iter(__p), make_move_iterator(__v.begin()),
- make_move_iterator(__v.end()));
+ insert(__make_iter(__p), _VSTD::make_move_iterator(__v.begin()),
+ _VSTD::make_move_iterator(__v.end()));
return begin() + __off;
}
diff --git a/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp b/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
index 74cb612..413030d 100644
--- a/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
+++ b/test/std/containers/sequences/vector/vector.modifiers/insert_iter_iter_iter.pass.cpp
@@ -21,6 +21,11 @@
#include "min_allocator.h"
#include "asan_testing.h"
+namespace adl {
+struct S {};
+void make_move_iterator(S*) {}
+}
+
int main(int, char**)
{
{
@@ -172,5 +177,10 @@
}
#endif
+ {
+ std::vector<adl::S> s;
+ s.insert(s.end(), input_iterator<adl::S*>(), input_iterator<adl::S*>());
+ }
+
return 0;
}