From e278e62f91d955ce808fcf4d05826c7b2779888f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Fri, 20 Dec 2019 12:42:50 +0000 Subject: [PATCH] libstdc++: Fix pretty printers script and tests * python/libstdcxx/v6/printers.py (lookup_node_type): Remove redundant call to lookup_node_type. * testsuite/libstdc++-prettyprinters/80276.cc: Define _GLIBCXX_USE_CXX11_ABI to 0. * testsuite/libstdc++-prettyprinters/91997.cc: Use regexp-test to check 'a' content. From-SVN: r279640 --- libstdc++-v3/ChangeLog | 9 +++++++++ libstdc++-v3/python/libstdcxx/v6/printers.py | 1 - libstdc++-v3/testsuite/libstdc++-prettyprinters/80276.cc | 3 +++ libstdc++-v3/testsuite/libstdc++-prettyprinters/91997.cc | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 126f3d386b5..82b2bbfed3b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2019-12-20 François Dumont + + * python/libstdcxx/v6/printers.py (lookup_node_type): Remove redundant + call to lookup_node_type. + * testsuite/libstdc++-prettyprinters/80276.cc: Define + _GLIBCXX_USE_CXX11_ABI to 0. + * testsuite/libstdc++-prettyprinters/91997.cc: Use regexp-test to check + 'a' content. + 2019-12-20 Jerome Lambourg * acinclude.m4 (_GLIBCXX_USE_PTHREAD_RWLOCK_T): Checks that _PTHREADS diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 5eab57ea6a7..c98ec8fee8a 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -146,7 +146,6 @@ def lookup_node_type(nodename, containertype): if is_member_of_namespace(containertype, 'std::__cxx1998', 'std::__debug', '__gnu_debug'): nodename = nodename.replace('::', '::__cxx1998::', 1) - return lookup_templ_spec(nodename, valtype) try: return lookup_templ_spec(nodename, valtype) except gdb.error: diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/80276.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/80276.cc index 3425b499e3a..272adb86e0c 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/80276.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/80276.cc @@ -18,6 +18,9 @@ // with this library; see the file COPYING3. If not see // . +// Type printers only recognize the old std::string for now. +#define _GLIBCXX_USE_CXX11_ABI 0 + #include #include #include diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/91997.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/91997.cc index 393c5680e2e..059ac9aa97f 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/91997.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/91997.cc @@ -41,7 +41,7 @@ int main() // { dg-final { note-test mit {{first = 1, second = 2}} } } std::any a = m; - // { dg-final { note-test a {std::any containing std::map with 1 element = {[1] = 2}} } } + // { dg-final { regexp-test a {std::any containing std::(__debug::)?map with 1 element = {\[1\] = 2}} } } std::set s{1, 2}; auto sit = s.begin(); -- 2.30.2