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
This commit is contained in:
François Dumont 2019-12-20 12:42:50 +00:00
parent 95d27703bc
commit e278e62f91
4 changed files with 13 additions and 2 deletions

View File

@ -1,3 +1,12 @@
2019-12-20 François Dumont <fdumont@gcc.gnu.org>
* 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 <lambourg@adacore.com>
* acinclude.m4 (_GLIBCXX_USE_PTHREAD_RWLOCK_T): Checks that _PTHREADS

View File

@ -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:

View File

@ -18,6 +18,9 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// Type printers only recognize the old std::string for now.
#define _GLIBCXX_USE_CXX11_ABI 0
#include <iostream>
#include <list>
#include <memory>

View File

@ -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<int> s{1, 2};
auto sit = s.begin();