From: Giuliano Procida <gprocida@google.com>
To: libabigail@sourceware.org
Cc: dodji@seketeli.org, kernel-team@android.com, gprocida@google.com,
maennich@google.com, woodard@redhat.com
Subject: [RFC PATCH 5/9] Add pass to normalise anonymous type names
Date: Thu, 25 Mar 2021 21:51:42 +0000 [thread overview]
Message-ID: <20210325215146.3597963-6-gprocida@google.com> (raw)
In-Reply-To: <20210325215146.3597963-1-gprocida@google.com>
Currently libabigail exposes the internal names used for anonymous
types in ABI XML. The names are not stable - they are subject to
renumbering - and cause "harmless" diffs which in turn can contribute
to hard-to-read and verbose abidiff --harmless output.
* scripts/abitidy.pl (normalise_anonymous_type_names): New
function to normalise anonymous type names by stripping off
numerical suffices.
Signed-off-by: Giuliano Procida <gprocida@google.com>
---
scripts/abitidy.pl | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/scripts/abitidy.pl b/scripts/abitidy.pl
index 468eeac4..321363d7 100755
--- a/scripts/abitidy.pl
+++ b/scripts/abitidy.pl
@@ -366,6 +366,16 @@ sub filter_symbols($symbols, $dom) {
}
}
+sub normalise_anonymous_type_names($) {
+ my ($doc) = @_;
+ my $name_path = new XML::LibXML::XPathExpression('//abi-instr//*[@name]');
+ for my $node ($doc->findnodes($name_path)) {
+ my $value = $node->getAttribute('name');
+ $value =~ s;^(__anonymous_[a-z]+__)\d*$;$1;;
+ $node->setAttribute('name', $value);
+ }
+}
+
# Parse arguments.
my $input_opt;
my $output_opt;
@@ -373,14 +383,16 @@ my $symbols_opt;
my $all_opt;
my $drop_opt;
my $prune_opt;
+my $normalise_opt;
GetOptions('i|input=s' => \$input_opt,
'o|output=s' => \$output_opt,
's|symbols=s' => \$symbols_opt,
'a|all' => sub {
- $drop_opt = $prune_opt = 1
+ $drop_opt = $prune_opt = $normalise_opt = 1
},
'd|drop-empty!' => \$drop_opt,
'p|prune-unreachable!' => \$prune_opt,
+ 'n|normalise-anonymous!' => \$normalise_opt,
) and !@ARGV or die("usage: $0",
map { (' ', $_) } (
'[-i|--input file]',
@@ -389,6 +401,7 @@ GetOptions('i|input=s' => \$input_opt,
'[-a|--all]',
'[-d|--[no-]drop-empty]',
'[-p|--[no-]prune-unreachable]',
+ '[-n|--[no-]normalise-anonymous]',
), "\n");
exit 0 unless defined $input_opt;
@@ -404,6 +417,9 @@ strip_text($dom);
# Remove unlisted symbols.
filter_symbols(read_symbols($symbols_opt), $dom) if defined $symbols_opt;
+# Normalise anonymous type names.
+normalise_anonymous_type_names($dom) if $normalise_opt;
+
# Prune unreachable elements.
prune_unreachable($dom) if $prune_opt;
--
2.31.0.291.g576ba9dcdaf-goog
next prev parent reply other threads:[~2021-03-25 21:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 11:53 [RFC PATCH] Add an experimental ABI pruning utility Giuliano Procida
2021-03-11 20:39 ` Ben Woodard
2021-03-12 16:51 ` Giuliano Procida
2021-03-12 18:41 ` Ben Woodard
2021-03-15 11:08 ` Giuliano Procida
2021-03-12 16:59 ` [RFC PATCH v2] " Giuliano Procida
2021-03-16 16:55 ` [RFC PATCH v3] " Giuliano Procida
2021-03-25 21:51 ` [RFC PATCH 0/9] Utility to manipulate ABI XML Giuliano Procida
2021-03-25 21:51 ` [RFC PATCH 1/9] Add ABI tidying utility Giuliano Procida
2021-03-25 21:51 ` [RFC PATCH 2/9] Add pass to drop empty XML elements Giuliano Procida
2021-03-25 21:51 ` [RFC PATCH 3/9] Add pass to prune unreachable parts of the ABI Giuliano Procida
2021-03-25 21:51 ` [RFC PATCH 4/9] Add pass to filter symbols Giuliano Procida
2021-03-25 21:51 ` Giuliano Procida [this message]
2021-03-25 21:51 ` [RFC PATCH 6/9] Add pass to report duplicate type ids Giuliano Procida
2021-03-25 21:51 ` [RFC PATCH 7/9] Add pass to eliminate duplicate member-type fragments Giuliano Procida
2021-03-25 21:51 ` [RFC PATCH 8/9] Add pass to stabilise types and declarations Giuliano Procida
2021-03-25 21:51 ` [RFC PATCH 9/9] Add pass to resolve stray forward type declarations Giuliano Procida
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=20210325215146.3597963-6-gprocida@google.com \
--to=gprocida@google.com \
--cc=dodji@seketeli.org \
--cc=kernel-team@android.com \
--cc=libabigail@sourceware.org \
--cc=maennich@google.com \
--cc=woodard@redhat.com \
/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).