[gcc r12-10239] libstdc++: Qualify calls to std::_Destroy and _Destroy_aux

[Jonathan Wakely via Gcc-cvs]

https://gcc.gnu.org/g:5c4cd53ffd70205b2b136661b3be175dec0ce8d7

commit r12-10239-g5c4cd53ffd70205b2b136661b3be175dec0ce8d7
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Fri Jun 30 21:09:01 2023 +0100

    libstdc++: Qualify calls to std::_Destroy and _Destroy_aux
    
    These calls should be qualified to prevent ADL, which can cause errors
    for incomplete types that are associated classes.
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/alloc_traits.h (_Destroy): Qualify call.
            * include/bits/stl_construct.h (_Destroy, _Destroy_n): Likewise.
            * testsuite/23_containers/vector/cons/destroy-adl.cc: New test.
    
    (cherry picked from commit 33245d6b87a284495304c9952813b6b83d5df99f)

Diff:
---
 libstdc++-v3/include/bits/alloc_traits.h                      |  2 +-
 libstdc++-v3/include/bits/stl_construct.h                     |  4 ++--
 .../testsuite/23_containers/vector/cons/destroy-adl.cc        | 11 +++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/libstdc++-v3/include/bits/alloc_traits.h 
b/libstdc++-v3/include/bits/alloc_traits.h
index a4d06d3fc7a..5cc52babef8 100644
--- a/libstdc++-v3/include/bits/alloc_traits.h
+++ b/libstdc++-v3/include/bits/alloc_traits.h
@@ -847,7 +847,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     _Destroy(_ForwardIterator __first, _ForwardIterator __last,
             allocator<_Tp>&)
     {
-      _Destroy(__first, __last);
+      std::_Destroy(__first, __last);
     }
 
 _GLIBCXX_END_NAMESPACE_VERSION
diff --git a/libstdc++-v3/include/bits/stl_construct.h 
b/libstdc++-v3/include/bits/stl_construct.h
index 9531222809c..a081f26adc3 100644
--- a/libstdc++-v3/include/bits/stl_construct.h
+++ b/libstdc++-v3/include/bits/stl_construct.h
@@ -190,7 +190,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 #endif
 #if __cplusplus >= 202002L
       if (std::__is_constant_evaluated())
-       return _Destroy_aux<false>::__destroy(__first, __last);
+       return std::_Destroy_aux<false>::__destroy(__first, __last);
 #endif
       std::_Destroy_aux<__has_trivial_destructor(_Value_type)>::
        __destroy(__first, __last);
@@ -239,7 +239,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 #endif
 #if __cplusplus >= 202002L
       if (std::__is_constant_evaluated())
-       return _Destroy_n_aux<false>::__destroy_n(__first, __count);
+       return std::_Destroy_n_aux<false>::__destroy_n(__first, __count);
 #endif
       return std::_Destroy_n_aux<__has_trivial_destructor(_Value_type)>::
        __destroy_n(__first, __count);
diff --git a/libstdc++-v3/testsuite/23_containers/vector/cons/destroy-adl.cc 
b/libstdc++-v3/testsuite/23_containers/vector/cons/destroy-adl.cc
new file mode 100644
index 00000000000..5623842e9b1
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/vector/cons/destroy-adl.cc
@@ -0,0 +1,11 @@
+// { dg-do compile }
+
+#include <vector>
+
+template<class T> struct Holder { T t; }; // { dg-bogus "incomplete type" }
+struct Incomplete;
+
+void destroy(std::vector<Holder<Incomplete>*>* p)
+{
+  p->~vector();
+}