From patchwork Sat Feb 4 16:27:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Catmur X-Patchwork-Id: 64297 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 29C7D3857B98 for ; Sat, 4 Feb 2023 16:28:19 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by sourceware.org (Postfix) with ESMTPS id 3B8C83858C52 for ; Sat, 4 Feb 2023 16:28:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3B8C83858C52 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=catmur.uk Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=catmur.uk Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id EE6365C0109; Sat, 4 Feb 2023 11:28:03 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sat, 04 Feb 2023 11:28:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=catmur.uk; h=cc :cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=fm3; t=1675528083; x=1675614483; bh=/3tJ1nSjHLwpzf2kTy6kTirKA r0ZJ8V1XV3iCP8pZvo=; b=bTOR6sDibduENNMGfw1zeOu0bay5fQxDADWuayJth 9OVWwoXgfz4pUUv5JAWpEeIkZJYICWPphJHJO5twxIi3jtr9TbvDh8iJ+zdfgkvs /X0rYjcWiP/gnaaxUDR6KctfWgJ7bMPt/Md+uQ2D8PFE5F+D6lTJ4q7j58ejEadQ x/7FPq1+m//U33mWn4ZRIEVItIGa1LyJbc4N7Uv6zbfO/FACN5qt4+/XgoCKkPnN AqpUWTS+adEG1oGbACYS0lhO+Af/xUez8c2FErrAz+RMIpL+zUoT9vvjVAhaI1cY 4xJIB5XZpX1JK9Eyr2UcpznVjhpboPDsbARmTPWoDGxDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1675528083; x=1675614483; bh=/3tJ1nSjHLwpzf2kTy6kTirKAr0ZJ8V1XV3 iCP8pZvo=; b=QMOHNaO1uxUs3iKR5flIk3iNB8LEBm2Jzesm3DJsDavbCjagl8t 4ng32zjE5hBqBQq/kgNRNEyeXZH6CdJKkEshaBtb7tb7o7dlWpKJ23TXUdxwFP25 vtg6m0w/XIOYG2+WeaizgZPU4TFP0XJlvZ36CZG3+jF8f21+lEiWjfl7W87ekpRz AsLpuJe40vUvf123Pi9n98K0NG++PVFFwpIy/ngEvFHyxwR12Jm88YWu2kg8yJNk xDROtwfjYIyndoApdZAV7PFe4sCtW2kadeCplXf6sVMSMsZhyCSyjrjZv676Ir5y m1iI82VWNyNgei2ddks4RlYN80gFT3n5daQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrudegvddgkeekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefgugcuvegrthhmuhhruceovggusegtrghtmhhurhdruhhkqeen ucggtffrrghtthgvrhhnpeeggeduudefteejheeuheeghfffleffvedtffduhfeihfeife ekvdfhleegleeufeenucffohhmrghinhepugifrghrfhhsthgurdhorhhgpdhgnhhurdho rhhgpdhgihhthhhusgdrtghomhdpshhouhhrtggvfigrrhgvrdhorhhgnecuvehluhhsth gvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepvggusegtrghtmhhurhdr uhhk X-ME-Proxy: Feedback-ID: i5729427b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 4 Feb 2023 11:28:02 -0500 (EST) From: Ed Catmur To: gdb-patches@sourceware.org Cc: Ed Catmur Subject: [PATCH v2][PR 17272] Support DWARF tags for C++11 variadic templates Date: Sat, 4 Feb 2023 17:27:55 +0100 Message-Id: <20230204162755.2831-1-ed@catmur.uk> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_SHORT, KAM_STOCKGEN, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS, SPF_PASS, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This patch adds support for DW_TAG_GNU_formal_parameter_pack and DW_TAG_GNU_template_parameter_pack, added to DWARF in March 2009 for C++11 variadic templates[1]. They are not currently emitted thanks to a typo[2] but the fix is trivial[3] and has been repeatedly submitted[4] to gcc; I'm not sure what else I can do to get it accepted; regardless, anyone building their own compiler can still make use of this. This implementation synthesizes type and parameter names as T#n, p#n e.g. Args#1, args#1. This is a pretty simple approach but it seems to work OK and is compatible with the old style type and parameter names emitted by old versions of gcc and when it's writing stabs+ format, meaning that any debugger scripts will continue to work. 1. http://wiki.dwarfstd.org/index.php?title=C%2B%2B0x:_Variadic_templates 2. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70536 3. https://github.com/ecatmur/gcc/pull/5 4. https://gcc.gnu.org/pipermail/gcc-patches/2023-January/609659.html PR. https://sourceware.org/bugzilla/show_bug.cgi?id=17272 --- gdb/dwarf2/read.c | 71 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index ee4e7c1530..7591be5764 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -12103,7 +12103,8 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) for (child_die = die->child; child_die; child_die = child_die->sibling) { if (child_die->tag == DW_TAG_template_type_param - || child_die->tag == DW_TAG_template_value_param) + || child_die->tag == DW_TAG_template_value_param + || child_die->tag == DW_TAG_GNU_template_parameter_pack) { templ_func = new (&objfile->objfile_obstack) template_symbol; templ_func->subclass = SYMBOL_TEMPLATE; @@ -12152,6 +12153,23 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) if (arg != NULL) template_args.push_back (arg); } + else if (child_die->tag == DW_TAG_GNU_template_parameter_pack) + { + struct die_info *pack_die; + for (pack_die = child_die->child; pack_die; pack_die = pack_die->sibling) + { + struct symbol *arg = new_symbol (pack_die, NULL, cu); + + if (arg != NULL) + template_args.push_back (arg); + } + } + else if (child_die->tag == DW_TAG_GNU_formal_parameter_pack) + { + struct die_info *pack_die; + for (pack_die = child_die->child; pack_die; pack_die = pack_die->sibling) + process_die (pack_die, cu); + } else process_die (child_die, cu); child_die = child_die->sibling; @@ -16639,6 +16657,11 @@ read_subroutine_type (struct die_info *die, struct dwarf2_cu *cu) { if (child_die->tag == DW_TAG_formal_parameter) nparams++; + else if (child_die->tag == DW_TAG_GNU_formal_parameter_pack) + { + child_die = child_die->child; + continue; + } else if (child_die->tag == DW_TAG_unspecified_parameters) ftype->set_has_varargs (true); @@ -16714,6 +16737,11 @@ read_subroutine_type (struct die_info *die, struct dwarf2_cu *cu) ftype->field (iparams).set_type (arg_type); iparams++; } + else if (child_die->tag == DW_TAG_GNU_formal_parameter_pack) + { + child_die = child_die->child; + continue; + } child_die = child_die->sibling; } } @@ -20847,13 +20875,16 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu, sym->set_type (type); else sym->set_type (die_type (die, cu)); - attr = dwarf2_attr (die, + struct die_info *line_file_die = die; + if (die->tag == DW_TAG_formal_parameter && die->parent && die->parent->tag == DW_TAG_GNU_formal_parameter_pack) + line_file_die = die->parent; + attr = dwarf2_attr (line_file_die, inlined_func ? DW_AT_call_line : DW_AT_decl_line, cu); if (attr != nullptr) sym->set_line (attr->constant_value (0)); - attr = dwarf2_attr (die, + attr = dwarf2_attr (line_file_die, inlined_func ? DW_AT_call_file : DW_AT_decl_file, cu); if (attr != nullptr && attr->is_nonnegative ()) @@ -21073,6 +21104,8 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu, list_to_add = cu->list_in_scope; } break; + case DW_TAG_GNU_formal_parameter_pack: + break; case DW_TAG_unspecified_parameters: /* From varargs functions; gdb doesn't seem to have any interest in this information, so just ignore it for now. @@ -22081,8 +22114,11 @@ dwarf2_name (struct die_info *die, struct dwarf2_cu *cu) if (attr_name == nullptr && die->tag != DW_TAG_namespace && die->tag != DW_TAG_class_type + && die->tag != DW_TAG_formal_parameter && die->tag != DW_TAG_interface_type && die->tag != DW_TAG_structure_type + && die->tag != DW_TAG_template_type_param + && die->tag != DW_TAG_template_value_param && die->tag != DW_TAG_namelist && die->tag != DW_TAG_union_type && die->tag != DW_TAG_template_type_param @@ -22111,9 +22147,36 @@ dwarf2_name (struct die_info *die, struct dwarf2_cu *cu) return attr_name; return CP_ANONYMOUS_NAMESPACE_STR; - /* DWARF does not actually require template tags to have a name. */ + case DW_TAG_formal_parameter: case DW_TAG_template_type_param: case DW_TAG_template_value_param: + if (!attr + && die->parent + && (die->parent->tag == DW_TAG_GNU_formal_parameter_pack + || die->parent->tag == DW_TAG_GNU_template_parameter_pack)) + { + const char *parent_name; + int ordinal = 0; + struct die_info *child_die; + size_t size; + char *name; + parent_name = dwarf2_name(die->parent, cu); + if (!parent_name) + return NULL; + for (child_die = die->parent->child; child_die != die; child_die = child_die->sibling) + ++ordinal; + size = snprintf(NULL, 0, "%s#%d", parent_name, ordinal) + 1; + name = ((char *) obstack_alloc (&cu->per_objfile->per_bfd->obstack, size)); + snprintf(name, size, "%s#%d", parent_name, ordinal); + return name; + } + if (die->tag == DW_TAG_formal_parameter) + { + if (!attr || attr_name == NULL) + return NULL; + break; + } + /* DWARF does not actually require template tags to have a name. */ if (attr_name == nullptr) return unnamed_template_tag_name (die, cu); /* FALLTHROUGH. */