libstdc++: Fix vector<bool> 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<bool>::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<bool> 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 <jwakely@redhat.com>
libstdc++-v3/ChangeLog:

	* python/libstdcxx/v6/printers.py (StdBitReferencePrinter): Use
	'std::vector<bool>::reference' as type name, not _Bit_reference.
	(build_libstdcxx_dictionary): Register printers for vector<bool>
	types in debug mode too.
	* testsuite/libstdc++-prettyprinters/simple.cc: Adjust expected
	output for invalid _Bit_reference. Use vector<bool>::reference
	instead of _Bit_reference.
	* testsuite/libstdc++-prettyprinters/simple11.cc: Likewise.

diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index 82d262de8c7a75084be10e157352665284683697..c7da4079a7ddf65419fd07b6a05aabbfe87555ad 100644 (file)
--- 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<bool>::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<bool>::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 c1fc4b1fe72a0060e147fd20b627f00217364652..02f762efe28efd0cc36fdf50c3d43697703b2214 100644 (file)
--- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc
+++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc
@@ -144,19 +144,19 @@ main()
   std::vector<bool>::iterator vbIt0;
 // { dg-final { note-test vbIt0 {non-dereferenceable iterator for std::vector<bool>} } }
 
-  std::_Bit_reference br = *vb.begin();
+  std::vector<bool>::reference br = *vb.begin();
 // { dg-final { note-test br {true} } }
-  std::_Bit_reference br2 = *vbIt2;
+  std::vector<bool>::reference br2 = *vbIt2;
 // { dg-final { note-test br2 {true} } }
-  std::_Bit_reference br3 = *vbIt3;
+  std::vector<bool>::reference br3 = *vbIt3;
 // { dg-final { note-test br3 {false} } }
-  std::_Bit_reference br4 = *vbIt4;
+  std::vector<bool>::reference br4 = *vbIt4;
 // { dg-final { note-test br4 {false} } }
-  std::_Bit_reference br5 = *vbIt5;
+  std::vector<bool>::reference br5 = *vbIt5;
 // { dg-final { note-test br5 {true} } }
 
- std::_Bit_reference br0;
-// { dg-final { note-test br0 {invalid std::_Bit_reference} } }
+ std::vector<bool>::reference br0;
+// { dg-final { note-test br0 {invalid std::vector<bool>::reference} } }
 
   __gnu_cxx::slist<int> sll;
   sll.push_front(23);

diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc
index d219e271ff3e32fbd2cb0b349fab8bce16f4d5b1..bd6e026a32960526726a84cde08274004554fc76 100644 (file)
--- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc
+++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc
@@ -137,19 +137,19 @@ main()
   std::vector<bool>::iterator vbIt0;
 // { dg-final { note-test vbIt0 {non-dereferenceable iterator for std::vector<bool>} } }
 
-  std::_Bit_reference br = *vb.begin();
+  std::vector<bool>::reference br = *vb.begin();
 // { dg-final { note-test br {true} } }
-  std::_Bit_reference br2 = *vbIt2;
+  std::vector<bool>::reference br2 = *vbIt2;
 // { dg-final { note-test br2 {true} } }
-  std::_Bit_reference br3 = *vbIt3;
+  std::vector<bool>::reference br3 = *vbIt3;
 // { dg-final { note-test br3 {false} } }
-  std::_Bit_reference br4 = *vbIt4;
+  std::vector<bool>::reference br4 = *vbIt4;
 // { dg-final { note-test br4 {false} } }
-  std::_Bit_reference br5 = *vbIt5;
+  std::vector<bool>::reference br5 = *vbIt5;
 // { dg-final { note-test br5 {true} } }
 
- std::_Bit_reference br0;
-// { dg-final { note-test br0 {invalid std::_Bit_reference} } }
+ std::vector<bool>::reference br0;
+// { dg-final { note-test br0 {invalid std::vector<bool>::reference} } }
 
   __gnu_cxx::slist<int> sll;
   sll.push_front(23);