diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2024-08-27 13:30:42 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2024-08-27 14:20:13 +0100 |
| commit | 75ef21665cb924265b818b08babbc7ec3108c876 (patch) | |
| tree | fc25c9f69210003d6f533fa5696a63d83fef08eb | |
| parent | 470a27859d8a47a99f389f1dc6edb82c08b16e21 (diff) | |
| download | gcc-75ef21665cb924265b818b08babbc7ec3108c876.zip gcc-75ef21665cb924265b818b08babbc7ec3108c876.tar.gz gcc-75ef21665cb924265b818b08babbc7ec3108c876.tar.bz2 | |
libstdc++: Do not use std::vector<bool>::reference default ctor [PR115098]
This default constructor was made private by r15-3124-gb25b101bc38000 so
the pretty printer tests need a fix to stop using it. There's no
conforming way to get a default-constructed 'reference' now, e.g. trying
to access an element of a default-constructed std::vector<bool> will
trigger an assertion. Remove the tests, but leave a comment in the
printer code about handling it.
libstdc++-v3/ChangeLog:
PR libstdc++/115098
* python/libstdcxx/v6/printers.py (StdBitReferencePrinter): Add
comment.
* testsuite/libstdc++-prettyprinters/simple.cc: Do not default
construct std::vector<bool>::reference.
* testsuite/libstdc++-prettyprinters/simple11.cc: Likewise.
| -rw-r--r-- | libstdc++-v3/python/libstdcxx/v6/printers.py | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index a6c2ed4..9210493 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -613,6 +613,9 @@ class StdBitReferencePrinter(printer_base): def to_string(self): if not self._val['_M_p']: + # PR libstdc++/115098 removed the reference default constructor + # that this case relates to. New code should never need this, + # but we still handle it for compatibility with old binaries. return 'invalid std::vector<bool>::reference' return bool(self._val['_M_p'].dereference() & (self._val['_M_mask'])) diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc index 7bdc654..c6d18d3 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc @@ -153,9 +153,6 @@ main() std::vector<bool>::reference br5 = *vbIt5; // { dg-final { note-test br5 {true} } } - std::vector<bool>::reference br0; -// { dg-final { note-test br0 {invalid std::vector<bool>::reference} } } - __gnu_cxx::slist<int> sll; sll.push_front(23); sll.push_front(47); diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc index 3658e3e..7fd0c4d 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc @@ -146,9 +146,6 @@ main() std::vector<bool>::reference br5 = *vbIt5; // { dg-final { note-test br5 {true} } } - std::vector<bool>::reference br0; -// { dg-final { note-test br0 {invalid std::vector<bool>::reference} } } - __gnu_cxx::slist<int> sll; sll.push_front(23); sll.push_front(47); |