From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id E493F3959C9F for ; Wed, 16 Nov 2022 11:55:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E493F3959C9F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668599713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2jpIO+9bDk+j+y97t3EWWRRG6sgpyFaIz25U2jkY4nQ=; b=cc4p3EZ2/kLzlp/PRzw3/xaTogOJx/xM0lrcRZ19gBtc4e2GIKgX0o/5u32eMQ2i/xcjJr k0lFzUGiU2HKCQPETbCrBybA8D/MexBqkzYEg84zraAMTNXKmNoWv+HKuu+FBSK6QX1c9q k3Ojh6vf3vVvDnyw0T5EY378SK5xLjU= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-635-oerZiEJWODSqihzV_ELnsg-1; Wed, 16 Nov 2022 06:55:12 -0500 X-MC-Unique: oerZiEJWODSqihzV_ELnsg-1 Received: by mail-ed1-f71.google.com with SMTP id x18-20020a05640226d200b00461e027f704so12121072edd.7 for ; Wed, 16 Nov 2022 03:55:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2jpIO+9bDk+j+y97t3EWWRRG6sgpyFaIz25U2jkY4nQ=; b=AM8QSX/PjAPohFhhdE6MyD8rocrgk9iMCMpffOTxrauhlPpp8VnOywINTshDgjQw1N an1R5atz3OlLve5jK376bEVvvQkS350SA62QsyDH49g6Y0LkBgtcmF1ypvoGkBQqFzFe 5tu8F7QEqGYHxPB4gGciJTdQDmU1IHAG25L6zS9Z7r7ysTC7uxA+Ttwj4uc6n2OANfDs SZgqCXCTxX/570c3u4M2YNdsd8RYFd6n6IfAOkaj+3cAg0+qiCACveIyh15bbIsoM3VM qP1NTKMbTqvmSyPvNy6rB8zdXs2wsPAyTTaW69asEfRU2wmo8j63V3NlWPav7YUqQ648 Cl2A== X-Gm-Message-State: ANoB5pkHZgrxOLXGRuur36i3vhdP1t7MxT8F+ThxLQGwNhgMybTkIfju 2QYmh/y+BPRPxC4xsVyDkKzkp3EK9kdfSWeBd0rhfi5eL4ylciZun+aTM5XBnpMyyn2gY8GUTvS AOtRSK02ml7xuzVw4bvLPUNZdHAn2OFo= X-Received: by 2002:a17:906:5a6f:b0:7ad:8bd5:b7df with SMTP id my47-20020a1709065a6f00b007ad8bd5b7dfmr16891570ejc.57.1668599711153; Wed, 16 Nov 2022 03:55:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf6vUpxfvUC54Ee2GI5kAVdYn6+Qw0t437qiSr3rkUgQZVQQMQSx15Q/X4QRYmqhBsY1QKl6baXaPL7+uP20ZDs= X-Received: by 2002:a17:906:5a6f:b0:7ad:8bd5:b7df with SMTP id my47-20020a1709065a6f00b007ad8bd5b7dfmr16891555ejc.57.1668599710838; Wed, 16 Nov 2022 03:55:10 -0800 (PST) MIME-Version: 1.0 References: <4d1dc3d4-e945-d283-964a-4dab3b3cb33e@gmail.com> <6056a668-3b5a-04b0-a0cc-98ad0c6064b2@gmail.com> In-Reply-To: From: Jonathan Wakely Date: Wed, 16 Nov 2022 11:54:59 +0000 Message-ID: Subject: Re: [PATCH] Fix gdb FilteringTypePrinter (again) To: =?UTF-8?Q?Fran=C3=A7ois_Dumont?= Cc: "libstdc++@gcc.gnu.org" , gcc-patches X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Wed, 16 Nov 2022 at 11:35, Jonathan Wakely wrote: > > On Wed, 16 Nov 2022 at 06:04, Fran=C3=A7ois Dumont = wrote: > > > > On 15/11/22 17:17, Jonathan Wakely wrote: > > > On 06/10/22 19:38 +0200, Fran=C3=A7ois Dumont wrote: > > >> Hi > > >> > > >> Looks like the previous patch was not enough. When using it in the > > >> context of a build without dual abi and versioned namespace I starte= d > > >> having failures again. I guess I hadn't rebuild everything properly. > > >> > > >> This time I think the problem was in those lines: > > >> > > >> if self.type_obj =3D=3D type_obj: > > >> return strip_inline_namespaces(self.name) > > >> > > >> I've added a call to gdb.types.get_basic_type so that we do not comp= are > > >> a type with its typedef. > > >> > > >> Thanks for the pointer to the doc ! > > >> > > >> Doing so I eventually use your code Jonathan to make FilteringTypeFi= lter > > >> more specific to a given instantiation. > > >> > > >> libstdc++: Fix gdb FilteringTypePrinter > > >> > > >> Once we found a matching FilteringTypePrinter instance we look f= or > > >> the associated > > >> typedef and check that the returned Python Type is equal to the > > >> Type to recognize. > > >> But gdb Python Type includes properties to distinguish a typedef > > >> from the actual > > >> type. So use gdb.types.get_basic_type to check if we are indeed = on > > >> the same type. > > >> > > >> Additionnaly enhance FilteringTypePrinter matching mecanism by > > >> introducing targ1 that, > > >> if not None, will be used as the 1st template parameter. > > >> > > >> libstdc++-v3/ChangeLog: > > >> > > >> * python/libstdcxx/v6/printers.py (FilteringTypePrinter)= : > > >> Rename 'match' field > > >> 'template'. Add self.targ1 to specify the first template > > >> parameter of the instantiation > > >> to match. > > >> (add_one_type_printer): Add targ1 optional parameter, > > >> default to None. > > >> Use gdb.types.get_basic_type to compare the type to > > >> recognize and the type > > >> returned from the typedef lookup. > > >> (register_type_printers): Adapt calls to > > >> add_one_type_printers. > > >> > > >> Tested under Linux x86_64 normal, version namespace with or without = dual > > >> abi. > > >> > > >> Fran=C3=A7ois > > >> > > >> diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py > > >> b/libstdc++-v3/python/libstdcxx/v6/printers.py > > >> index 0fa7805183e..52339b247d8 100644 > > >> --- a/libstdc++-v3/python/libstdcxx/v6/printers.py > > >> +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py > > >> @@ -2040,62 +2040,72 @@ def add_one_template_type_printer(obj, name, > > >> defargs): > > >> > > >> class FilteringTypePrinter(object): > > >> r""" > > >> - A type printer that uses typedef names for common template > > >> specializations. > > >> + A type printer that uses typedef names for common template > > >> instantiations. > > >> > > >> Args: > > >> - match (str): The class template to recognize. > > >> + template (str): The class template to recognize. > > >> name (str): The typedef-name that will be used instead. > > >> + targ1 (str): The first template argument. > > >> + If arg1 is provided (not None), only template > > >> instantiations with this type > > >> + as the first template argument, e.g. if > > >> template=3D'basic_string > >> > > >> - Checks if a specialization of the class template 'match' is the > > >> same type > > >> + Checks if an instantiation of the class template 'template' is > > >> the same type > > >> as the typedef 'name', and prints it as 'name' instead. > > >> > > >> - e.g. if an instantiation of std::basic_istream is the sam= e > > >> type as > > >> + e.g. for template=3D'basic_istream', name=3D'istream', if any > > >> instantiation of > > >> + std::basic_istream is the same type as std::istream then > > >> print it as > > >> + std::istream. > > >> + > > >> + e.g. for template=3D'basic_istream', name=3D'istream', targ1=3D= 'char', > > >> if any > > >> + instantiation of std::basic_istream is the same type a= s > > >> std::istream then print it as std::istream. > > >> """ > > > > > > These are template specializations, not instantiations. Please undo > > > the changes to the comments, because the comments are 100% correct > > > now, and would become wrong with this patch. > > > > > > template struct foo { }; > > > using F =3D foo; // #1 > > > template struct foo { }; // #2 > > > template<> struct foo { }; // #3 > > > > > > #1 is a *specialization* of the class template foo. It is > > > *instantiated* when you construct one or depend on its size, or its > > > members. > > > #2 is a *partial specialization* and #3 is an explicit specialization= . > > > But #1 is a speclialization, not an instantiation. > > > > > > Instantiation is a process that happens during compilation. A > > > specialization is a type (or function, or variable) generated from a > > > template by substituting arguments for the template parameters. The > > > python type printer matches specializations. > > > > Lesson learned, thanks. > > > > Maybe comment on line 169 is wrong then. I think there is a clue in the > > function name 'is_specialization_of' :-) > > Good point! Thanks, I'll fix it. > > > > > > > > >> > > >> - def __init__(self, match, name): > > >> - self.match =3D match > > >> + def __init__(self, template, name, targ1): > > > > > > Is there a reason to require targ1 here, instead of making it > > > optional, by using =3DNone as the default? > > > > In your original, and I know untested, proposal it was not working. > > > > The function add_one_type_printer was missing to pass its targ1 > > parameter to the FilteringTypePrinter ctor but thanks to the default > > value it was un-noticed by the interpreter. > > My untested patch had this, which adds it, doesn't it? > > -def add_one_type_printer(obj, match, name): > - printer =3D FilteringTypePrinter('std::' + match, 'std::' + name) > +def add_one_type_printer(obj, match, name, targ1 =3D None): > + printer =3D FilteringTypePrinter('std::' + match, 'std::' + name, ta= rg1) > gdb.types.register_type_printer(obj, printer) > if _versioned_namespace: > ns =3D 'std::' + _versioned_namespace > - printer =3D FilteringTypePrinter(ns + match, ns + name) > + printer =3D FilteringTypePrinter(ns + match, ns + name, targ1) > gdb.types.register_type_printer(obj, printer) > > > I think FilteringTypePrinter should be usable without specifying None > explicitly as the argument. Even if we don't actually use it that way > today, it seems like a better API. If the argument is optional, then > the idiomatic way to express that is to give it a default, not require > None to be passed. > > I'll add that default argument, but first I need to figure out why I'm > seeing new failures for libfundts.cc with -D_GLIBCXX_USE_CXX11_ABI=3D0. > Your patch has introduced this new error: > > $12 =3D Python Exception : No type named > std::experimental::fundamentals_v1::any::_Manager_internal std::char_traits, std::allocator >>. > got: $12 =3D Python Exception : No type named > std::experimental::fundamentals_v1::any::_Manager_internal std::char_traits, std::allocator >>. > FAIL: libstdc++-prettyprinters/libfundts.cc print as The problem happens here in StdExpAnyPrinter: mgrname =3D m.group(1) # FIXME need to expand 'std::string' so that gdb.lookup_type wo= rks if 'std::string' in mgrname: mgrname =3D re.sub("std::string(?!\w)", str(gdb.lookup_type('std::string').strip_typedefs()), m.group(1)) mgrtype =3D gdb.lookup_type(mgrname) After your patch, gdb.lookup_type('std::string').strip_typedefs() is returning std::__cxx11::basic_string which is not the correct type for this specialization of the any manager function. It contains a std::basic_string.