From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 33FA3385C41F; Wed, 18 Aug 2021 14:36:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33FA3385C41F MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-2993] libstdc++: Fix vector printer tests to work in debug mode X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: f74433e70ae94a3b5291e45fea488b1cfdee4a34 X-Git-Newrev: c883d1dcdea8820015ee7ffdc68c03cf3b8180bf Message-Id: <20210818143604.33FA3385C41F@sourceware.org> Date: Wed, 18 Aug 2021 14:36:04 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Aug 2021 14:36:04 -0000 https://gcc.gnu.org/g:c883d1dcdea8820015ee7ffdc68c03cf3b8180bf commit r12-2993-gc883d1dcdea8820015ee7ffdc68c03cf3b8180bf Author: Jonathan Wakely Date: Tue Aug 17 15:06:22 2021 +0100 libstdc++: Fix vector printer tests to work in debug mode This fixes a compilation error in debug mode, due to std::_Bit_reference not being defined, because it's in namespace std::__cxx1998 instead. We can refer to it as vector::reference instead, which always works. That fixes some compilation errors in debug mode, but the tests fail at run-time instead because the printers for vector helpers are only registered for the std namespace, not std::__cxx1998. That is fixed by using add_container to register the printers instead of add_version, as the former registers them in the std and std::__cxx1998 namespaces. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * python/libstdcxx/v6/printers.py (StdBitReferencePrinter): Use 'std::vector::reference' as type name, not _Bit_reference. (build_libstdcxx_dictionary): Register printers for vector types in debug mode too. * testsuite/libstdc++-prettyprinters/simple.cc: Adjust expected output for invalid _Bit_reference. Use vector::reference instead of _Bit_reference. * testsuite/libstdc++-prettyprinters/simple11.cc: Likewise. Diff: --- libstdc++-v3/python/libstdcxx/v6/printers.py | 10 +++++----- libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc | 14 +++++++------- .../testsuite/libstdc++-prettyprinters/simple11.cc | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 82d262de8c7..c7da4079a7d 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -491,14 +491,14 @@ class StdBitIteratorPrinter: return bool(self.val['_M_p'].dereference() & (1 << self.val['_M_offset'])) class StdBitReferencePrinter: - "Print std::_Bit_reference" + "Print std::vector::reference" def __init__(self, typename, val): self.val = val def to_string(self): if not self.val['_M_p']: - return 'invalid std::_Bit_reference' + return 'invalid std::vector::reference' return bool(self.val['_M_p'].dereference() & (self.val['_M_mask'])) class StdTuplePrinter: @@ -2052,11 +2052,11 @@ def build_libstdcxx_dictionary (): StdDequeIteratorPrinter) libstdcxx_printer.add_version('__gnu_cxx::', '__normal_iterator', StdVectorIteratorPrinter) - libstdcxx_printer.add_version('std::', '_Bit_iterator', + libstdcxx_printer.add_container('std::', '_Bit_iterator', StdBitIteratorPrinter) - libstdcxx_printer.add_version('std::', '_Bit_const_iterator', + libstdcxx_printer.add_container('std::', '_Bit_const_iterator', StdBitIteratorPrinter) - libstdcxx_printer.add_version('std::', '_Bit_reference', + libstdcxx_printer.add_container('std::', '_Bit_reference', StdBitReferencePrinter) libstdcxx_printer.add_version('__gnu_cxx::', '_Slist_iterator', StdSlistIteratorPrinter) diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc index c1fc4b1fe72..02f762efe28 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc @@ -144,19 +144,19 @@ main() std::vector::iterator vbIt0; // { dg-final { note-test vbIt0 {non-dereferenceable iterator for std::vector} } } - std::_Bit_reference br = *vb.begin(); + std::vector::reference br = *vb.begin(); // { dg-final { note-test br {true} } } - std::_Bit_reference br2 = *vbIt2; + std::vector::reference br2 = *vbIt2; // { dg-final { note-test br2 {true} } } - std::_Bit_reference br3 = *vbIt3; + std::vector::reference br3 = *vbIt3; // { dg-final { note-test br3 {false} } } - std::_Bit_reference br4 = *vbIt4; + std::vector::reference br4 = *vbIt4; // { dg-final { note-test br4 {false} } } - std::_Bit_reference br5 = *vbIt5; + std::vector::reference br5 = *vbIt5; // { dg-final { note-test br5 {true} } } - std::_Bit_reference br0; -// { dg-final { note-test br0 {invalid std::_Bit_reference} } } + std::vector::reference br0; +// { dg-final { note-test br0 {invalid std::vector::reference} } } __gnu_cxx::slist sll; sll.push_front(23); diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc index d219e271ff3..bd6e026a329 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc @@ -137,19 +137,19 @@ main() std::vector::iterator vbIt0; // { dg-final { note-test vbIt0 {non-dereferenceable iterator for std::vector} } } - std::_Bit_reference br = *vb.begin(); + std::vector::reference br = *vb.begin(); // { dg-final { note-test br {true} } } - std::_Bit_reference br2 = *vbIt2; + std::vector::reference br2 = *vbIt2; // { dg-final { note-test br2 {true} } } - std::_Bit_reference br3 = *vbIt3; + std::vector::reference br3 = *vbIt3; // { dg-final { note-test br3 {false} } } - std::_Bit_reference br4 = *vbIt4; + std::vector::reference br4 = *vbIt4; // { dg-final { note-test br4 {false} } } - std::_Bit_reference br5 = *vbIt5; + std::vector::reference br5 = *vbIt5; // { dg-final { note-test br5 {true} } } - std::_Bit_reference br0; -// { dg-final { note-test br0 {invalid std::_Bit_reference} } } + std::vector::reference br0; +// { dg-final { note-test br0 {invalid std::vector::reference} } } __gnu_cxx::slist sll; sll.push_front(23);