From: François Dumont <fdumont@gcc.gnu.org>
Date: Wed, 25 May 2022 20:05:48 +0000 (+0200)
Subject: libstdc++: Fix printing of std::span for versioned namespace
X-Git-Tag: releases/gcc-12.2.0~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a9c87a204058586e62363dd06144db4b14e7562;p=thirdparty%2Fgcc.git

libstdc++: Fix printing of std::span for versioned namespace

libstdc++-v3/ChangeLog:

	* python/libstdcxx/v6/printers.py (StdSpanPrinter.__init__):
	Strip typename from version namespace.

(cherry picked from commit ace4b7f295f407b16cfbc2e359f4ef7cd61d4a46)
---

diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index 17d5e5b5731a..d47f9f27662f 100644
--- a/libstdc++-v3/python/libstdcxx/v6/printers.py
+++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
@@ -1688,7 +1688,7 @@ class StdSpanPrinter:
             return '[%d]' % count, (self.begin + count).dereference()
 
     def __init__(self, typename, val):
-        self.typename = typename
+        self.typename = strip_versioned_namespace(typename)
         self.val = val
         if val.type.template_argument(1) == gdb.parse_and_eval('static_cast<std::size_t>(-1)'):
             self.size = val['_M_extent']['_M_extent_value']
@@ -1995,7 +1995,7 @@ class FilteringTypePrinter(object):
         self.enabled = True
 
     class _recognizer(object):
-        "The recognizer class for TemplateTypePrinter."
+        "The recognizer class for FilteringTypePrinter."
 
         def __init__(self, match, name):
             self.match = match