From: Tom Tromey <tromey@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: libstdc++@gcc.gnu.org, Tom Tromey <tromey@adacore.com>
Subject: [PATCH 2/2] libstdc++: _versioned_namespace is always non-None
Date: Tue, 3 Oct 2023 11:18:51 -0600 [thread overview]
Message-ID: <20231003171851.1161340-3-tromey@adacore.com> (raw)
In-Reply-To: <20231003171851.1161340-1-tromey@adacore.com>
Some code in the pretty-printers seems to assume that the
_versioned_namespace global might be None (or the empty string).
However, doesn't occur, as the variable is never reassigned.
libstdc++-v3/ChangeLog:
* python/libstdcxx/v6/printers.py: Assume that
_versioned_namespace is non-None.
* python/libstdcxx/v6/xmethods.py (is_specialization_of):
Assume that _versioned_namespace is non-None.
---
libstdc++-v3/python/libstdcxx/v6/printers.py | 15 ++++++---------
libstdc++-v3/python/libstdcxx/v6/xmethods.py | 3 +--
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index 23efbd171ec..e370551cbe1 100644
--- a/libstdc++-v3/python/libstdcxx/v6/printers.py
+++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
@@ -139,7 +139,7 @@ def lookup_templ_spec(templ, *args):
except gdb.error as e:
# Type not found, try again in versioned namespace.
global _versioned_namespace
- if _versioned_namespace and _versioned_namespace not in templ:
+ if _versioned_namespace not in templ:
t = t.replace('::', '::' + _versioned_namespace, 1)
try:
return gdb.lookup_type(t)
@@ -211,16 +211,13 @@ def is_specialization_of(x, template_name):
global _versioned_namespace
if isinstance(x, gdb.Type):
x = x.tag
- if _versioned_namespace:
- template_name = '(%s)?%s' % (_versioned_namespace, template_name)
+ template_name = '(%s)?%s' % (_versioned_namespace, template_name)
return re.match('^std::%s<.*>$' % template_name, x) is not None
def strip_versioned_namespace(typename):
global _versioned_namespace
- if _versioned_namespace:
- return typename.replace(_versioned_namespace, '')
- return typename
+ return typename.replace(_versioned_namespace, '')
def strip_inline_namespaces(type_str):
@@ -2355,7 +2352,7 @@ class Printer(object):
# Add a name using _GLIBCXX_BEGIN_NAMESPACE_VERSION.
def add_version(self, base, name, function):
self.add(base + name, function)
- if _versioned_namespace and '__cxx11' not in base:
+ if '__cxx11' not in base:
vbase = re.sub('^(std|__gnu_cxx)::', r'\g<0>%s' %
_versioned_namespace, base)
self.add(vbase + name, function)
@@ -2527,7 +2524,7 @@ def add_one_template_type_printer(obj, name, defargs):
printer = TemplateTypePrinter('std::__debug::' + name, defargs)
gdb.types.register_type_printer(obj, printer)
- if _versioned_namespace and '__cxx11' not in name:
+ if '__cxx11' not in name:
# Add second type printer for same type in versioned namespace:
ns = 'std::' + _versioned_namespace
# PR 86112 Cannot use dict comprehension here:
@@ -2628,7 +2625,7 @@ class FilteringTypePrinter(object):
def add_one_type_printer(obj, template, name, targ1=None):
printer = FilteringTypePrinter('std::' + template, 'std::' + name, targ1)
gdb.types.register_type_printer(obj, printer)
- if _versioned_namespace and '__cxx11' not in template:
+ if '__cxx11' not in template:
ns = 'std::' + _versioned_namespace
printer = FilteringTypePrinter(ns + template, ns + name, targ1)
gdb.types.register_type_printer(obj, printer)
diff --git a/libstdc++-v3/python/libstdcxx/v6/xmethods.py b/libstdc++-v3/python/libstdcxx/v6/xmethods.py
index 8ccf57c4d6b..42e60eb57b1 100644
--- a/libstdc++-v3/python/libstdcxx/v6/xmethods.py
+++ b/libstdc++-v3/python/libstdcxx/v6/xmethods.py
@@ -39,8 +39,7 @@ def is_specialization_of(x, template_name):
"""
if isinstance(x, gdb.Type):
x = x.tag
- if _versioned_namespace:
- template_name = '(%s)?%s' % (_versioned_namespace, template_name)
+ template_name = '(%s)?%s' % (_versioned_namespace, template_name)
return re.match(r'^std::(__\d::)?%s<.*>$' % template_name, x) is not None
class LibStdCxxXMethod(gdb.xmethod.XMethod):
--
2.40.1
next prev parent reply other threads:[~2023-10-03 17:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-03 17:18 [PATCH 0/2] A couple minor _versioned_namespace patches Tom Tromey
2023-10-03 17:18 ` [PATCH 1/2] libstdc++: Define _versioned_namespace in xmethods.py Tom Tromey
2023-10-03 22:57 ` Jonathan Wakely
2023-10-03 17:18 ` Tom Tromey [this message]
2023-10-03 22:55 ` [PATCH 2/2] libstdc++: _versioned_namespace is always non-None Jonathan Wakely
2023-10-03 22:57 ` Jonathan Wakely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231003171851.1161340-3-tromey@adacore.com \
--to=tromey@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).