From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A2E1C2D8762 for ; Fri, 21 Aug 2026 21:35:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787348124; cv=none; b=mHfBV2ArVz5OrvROrWzVmtdC9EdkVJcJSsoW6azU0IjSGtZTxn+4XtH0arDZd7/pyuKpYiComE5stV8Dlqjmsb0LWymAmGi5wYFLsQQ3TdGcSTjBQFHPrUuthq4//n88wrqt/kcOOWLg+rdrATFJ+w7U5UG2Omd939LnI6R+/3I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787348124; c=relaxed/simple; bh=Y74tKejfEi8OCf89pC6XNvkDKs1WQ1x6nLt+SeJc9gQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PPjQ2iztuj31VRH4NEd+zb7MYYYHux8IWT0rqeRL63r/lQWHfxlI1wTcyvniZWCYKXw+qyQ5+IQcVzlAiZ/o1MfR+/GlWKwdg5ni+Sll8jwzyzxgBnY4+dHaet+OjCzR56IzO1AK00CFEE43f073/3AORjQlnn+VaJNmGobD2lI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hxZqEeLi; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hxZqEeLi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 858101F00A3A; Fri, 21 Aug 2026 21:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787348123; bh=ajaVgLpbNRHTGUnKeSq7TI/Pi1v/QyDPSvP94I80QCo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hxZqEeLisg4gDfLmlt+gFq18wU1uLW/j1hfGddYibxfp7B509ZfB/DjP6bvNwAz6h dvgWmFPFFJbnJbv2IBdYzelbX56EdbHC4wBmeDOVar3nZOPP16W1O1gZO1EDg+hcm1 My9ySNP60kyhm4dm9M17nnpmDtFlwA+cWqH3+jI54jLM+Vbu5X/RE8T6Zc8be8JB+F P4SrjFxoc+fXhpobIBwGl7Z+nx1ViJ7dwVQJR22N1nqqxsI3j7F5m59XoZVEC+3nFt SBljZ9hEHyr7ZAWYuXrnROUrbniEAbdsFuvNwBItep1DQOOQmjtijJsPNGu3b0sR8l ct6CYDtfgmafA== From: Arnaldo Carvalho de Melo To: Alan Maguire Cc: Jiri Olsa , Clark Williams , dwarves@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH v2 1/9] dwarf_loader: Initial support for DW_TAG_variant_part Date: Fri, 21 Aug 2026 18:35:00 -0300 Message-ID: <20260821213510.22423-2-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260821213510.22423-1-acme@kernel.org> References: <20260821213510.22423-1-acme@kernel.org> Precedence: bulk X-Mailing-List: dwarves@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Arnaldo Carvalho de Melo Still doesn't handle its sub hierarchy, i.e. the DW_TAG_variant entries and its underlying DW_TAG_member entries. This was noticed when running the regression test that uses a debug build of perf to process a perf.data file and test pahole's pretty printing features, as now perf has a synthetic workload that is written in rust: <0><20c95a>: Abbrev Number: 1 (DW_TAG_compile_unit) <20c95b> DW_AT_producer : (indirect string, offset: 0x4ee5a): clang LLVM (rustc version 1.93.1 (01f6ddf75 2026-02-11) (Fedora 1.93.1-1.fc43)) <20c95f> DW_AT_language : 28 (Rust) <20c961> DW_AT_name : (indirect string, offset: 0x4eeaa): tests/workloads/code_with_type.rs/@/code_with_type.d6e680867bfb8b27-cgu.0 <20c965> DW_AT_stmt_list : 0x5e1ed <20c969> DW_AT_comp_dir : (indirect string, offset: 0x487f1): /home/acme/git/perf-tools/tools/perf <20c96d> DW_AT_low_pc : 0 <20c975> DW_AT_ranges : 0x2d0 ⬢ [acme@toolbx pahole]$ So lets add some scaffolding for the Rust DWARF constructs involved for us to be able to continue using perf with DWARF to test the pretty printing features. Assisted-by: opencode:deepseek-v4-flash Signed-off-by: Arnaldo Carvalho de Melo --- dwarf_loader.c | 25 ++++++++++++++++++++++++- dwarves.c | 27 +++++++++++++++++++++++++++ dwarves.h | 16 ++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dwarf_loader.c b/dwarf_loader.c index 61d55bd70d643731..ac576f0936ac86a9 100644 --- a/dwarf_loader.c +++ b/dwarf_loader.c @@ -522,6 +522,8 @@ static void tag__init(struct tag *tag, struct cu *cu, Dwarf_Die *die) if (tag->tag == DW_TAG_imported_module || tag->tag == DW_TAG_imported_declaration) dwarf_tag__set_attr_type(dtag, type, die, DW_AT_import); + else if (tag->tag == DW_TAG_variant_part) + dwarf_tag__set_attr_type(dtag, type, die, DW_AT_discr); else dwarf_tag__set_attr_type(dtag, type, die, DW_AT_type); @@ -1238,6 +1240,18 @@ static struct template_parameter_pack *template_parameter_pack__new(Dwarf_Die *d return pack; } +static struct variant_part *variant_part__new(Dwarf_Die *die, struct cu *cu, struct conf_load *conf) +{ + struct variant_part *vpart = tag__alloc(cu, sizeof(*vpart)); + + if (vpart != NULL) { + tag__init(&vpart->tag, cu, die); + INIT_LIST_HEAD(&vpart->variants); + } + + return vpart; +} + /* Returns number of locations found or negative value for errors. */ static ptrdiff_t __dwarf_getlocations(Dwarf_Attribute *attr, ptrdiff_t offset, Dwarf_Addr *basep, @@ -2357,9 +2371,18 @@ static int die__process_class(Dwarf_Die *die, struct type *class, case DW_TAG_GNU_template_template_param: #endif case DW_TAG_subrange_type: // XXX: ADA stuff, its a type tho, will have other entries referencing it... - case DW_TAG_variant_part: // XXX: Rust stuff tag__print_not_supported(die); continue; + case DW_TAG_variant_part: { + struct variant_part *vpart = variant_part__new(die, cu, conf); + + if (vpart == NULL) + return -ENOMEM; + + /* DWARF permits more than one DW_TAG_variant_part for a structure. */ + type__add_variant_part(class, vpart); + continue; + } case DW_TAG_template_type_parameter: { struct template_type_param *ttparm = template_type_param__new(die, cu, conf); diff --git a/dwarves.c b/dwarves.c index 1748889bc051fcb4..b48d9a3b9c43eebc 100644 --- a/dwarves.c +++ b/dwarves.c @@ -405,6 +405,7 @@ void __type__init(struct type *type) INIT_LIST_HEAD(&type->type_enum); INIT_LIST_HEAD(&type->template_type_params); INIT_LIST_HEAD(&type->template_value_params); + INIT_LIST_HEAD(&type->variant_parts); type->template_parameter_pack = NULL; type->sizeof_member = NULL; type->member_prefix = NULL; @@ -1210,12 +1211,31 @@ static void type__delete_class_members(struct type *type, struct cu *cu) } } +static void variant_part__delete(struct variant_part *vpart, struct cu *cu) +{ + if (vpart == NULL) + return; + + cu__tag_free(cu, &vpart->tag); +} + +static void type__delete_variant_parts(struct type *type, struct cu *cu) +{ + struct variant_part *pos, *next; + + type__for_each_variant_part_safe_reverse(type, pos, next) { + list_del_init(&pos->tag.node); + variant_part__delete(pos, cu); + } +} + void class__delete(struct class *class, struct cu *cu) { if (class == NULL) return; type__delete_class_members(&class->type, cu); + type__delete_variant_parts(&class->type, cu); cu__tag_free(cu, class__tag(class)); } @@ -1225,6 +1245,7 @@ void type__delete(struct type *type, struct cu *cu) return; type__delete_class_members(type, cu); + type__delete_variant_parts(type, cu); if (type->suffix_disambiguation) zfree(&type->namespace.name); @@ -1288,6 +1309,11 @@ void type__add_template_value_param(struct type *type, struct template_value_par list_add_tail(&tvparam->tag.node, &type->template_value_params); } +void type__add_variant_part(struct type *type, struct variant_part *vpart) +{ + list_add_tail(&vpart->tag.node, &type->variant_parts); +} + struct class_member *type__last_member(struct type *type) { struct class_member *pos; @@ -1308,6 +1334,7 @@ static int type__clone_members(struct type *type, const struct type *from, struc INIT_LIST_HEAD(&type->type_enum); INIT_LIST_HEAD(&type->template_type_params); INIT_LIST_HEAD(&type->template_value_params); + INIT_LIST_HEAD(&type->variant_parts); type__for_each_member(from, pos) { struct class_member *clone = class_member__clone(pos, cu); diff --git a/dwarves.h b/dwarves.h index 99e9d183c853ea8b..0fc57ed0c7576c01 100644 --- a/dwarves.h +++ b/dwarves.h @@ -1021,6 +1021,11 @@ static inline struct formal_parameter_pack *tag__formal_parameter_pack(const str void formal_parameter_pack__add(struct formal_parameter_pack *pack, struct parameter *param); +struct variant_part { + struct tag tag; + struct list_head variants; +}; + /* * tag.tag can be DW_TAG_subprogram_type or DW_TAG_subroutine_type. */ @@ -1292,6 +1297,7 @@ struct type { uint8_t is_signed_enum:1; struct list_head template_type_params; struct list_head template_value_params; + struct list_head variant_parts; struct template_parameter_pack *template_parameter_pack; }; @@ -1409,9 +1415,19 @@ static inline struct class_member *class_member__next(struct class_member *membe #define type__for_each_tag_safe_reverse(type, pos, n) \ list_for_each_entry_safe_reverse(pos, n, &(type)->namespace.tags, tag.node) +/** + * type__for_each_variant_part_safe_reverse - safely iterate thru all variant_parts in a type, in reverse order + * @type: struct type instance to iterate + * @pos: struct variant_part iterator + * @n: struct variant_part temp iterator + */ +#define type__for_each_variant_part_safe_reverse(type, pos, n) \ + list_for_each_entry_safe_reverse(pos, n, &(type)->variant_parts, tag.node) + void type__add_member(struct type *type, struct class_member *member); void type__add_template_type_param(struct type *type, struct template_type_param *ttparm); void type__add_template_value_param(struct type *type, struct template_value_param *tvparam); +void type__add_variant_part(struct type *type, struct variant_part *vpart); struct class_member * type__find_first_biggest_size_base_type_member(struct type *type, -- 2.55.0