From patchwork Thu Mar 25 21:51:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 42778 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 3C5FE3858001; Thu, 25 Mar 2021 21:52:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3C5FE3858001 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1616709140; bh=YJPFkz1kZ4kivaqeQ046NiUbp1bHwylZ5GhGXY5qpJI=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=QzW1LWoVPpOePHcL213nnEGFkorBSuVJDm/KlaV5L4cJHwcLGQ5vZWj53veH7Cgjp jXRb8YmiEQ9e6MPq9ZfT0uyRCfDQQjFnrAspZls7M0Z8OdLhbPrOSvKeUGOzQsyxXG IkX/a73y284KHK5sxKl7sd2VNy6e1ZWWVr7uhxic= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-wr1-x44a.google.com (mail-wr1-x44a.google.com [IPv6:2a00:1450:4864:20::44a]) by sourceware.org (Postfix) with ESMTPS id 7D56B3854801 for ; Thu, 25 Mar 2021 21:52:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7D56B3854801 Received: by mail-wr1-x44a.google.com with SMTP id z6so3237948wrh.11 for ; Thu, 25 Mar 2021 14:52:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=YJPFkz1kZ4kivaqeQ046NiUbp1bHwylZ5GhGXY5qpJI=; b=i5o28iGUXdSYSxtwOcasemkrhkSv3/xMakNoowXv0DvFuRJfjwjDyn7hRaSwuPGJ7w QHUDBRqvYi3PRuOoLHur9+LxEE+7HwH7htXEB1+7+krYgQvbTwrhIGQd8ORWYrG6/WqR 6PpjtxWgTslTDLV4XLZRwVavqqUEVAnixRzf7yCxrug4+4bVEo0VnerVnBQigIy9fGMI 3EU/XTK19YmjD7h+ZbOl0QQ5UYey6jlvIy0EH0oEWfHX2eVbbi+60DL3AbGagzmmccGp qFBb4de3VLOirSAN56a2CYTKyG6+axGpg1D80vwmWYFr7Gbu4/o3QUYrYMHnxf9KTvdh swXw== X-Gm-Message-State: AOAM532fUF37GKYEXX/x4lVHADbmjIjR/Rnkcvd66uFKupfs0SOZgvsv ixxSzUXvE1g+H65SG28cejTK4RXmcmX4yo2FYKyIF2caIEVT7XZVSL6rmZI/LGZtrGVaPU0IieZ PXIGE1yZGsE9Tygjm7xUkfe8YbcKtqMLSej0EoJ674SO4Gqy/fZ1yXDQuFtSTz4WaDiCKdwA= X-Google-Smtp-Source: ABdhPJzilbAjWRb3zx66VcFyTqi8Ow/JqXPcOicRbGP42jN+VtaVPQJR8NBvjyVUPyrmikTi7EsawE3OXyiQ/Q== X-Received: from tef.lon.corp.google.com ([2a00:79e0:d:110:2df6:f24a:7f54:86a8]) (user=gprocida job=sendgmr) by 2002:a05:600c:2ca:: with SMTP id 10mr10057748wmn.40.1616709134533; Thu, 25 Mar 2021 14:52:14 -0700 (PDT) Date: Thu, 25 Mar 2021 21:51:42 +0000 In-Reply-To: <20210325215146.3597963-1-gprocida@google.com> Message-Id: <20210325215146.3597963-6-gprocida@google.com> Mime-Version: 1.0 References: <20210316165509.2658452-1-gprocida@google.com> <20210325215146.3597963-1-gprocida@google.com> X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog Subject: [RFC PATCH 5/9] Add pass to normalise anonymous type names To: libabigail@sourceware.org X-Spam-Status: No, score=-22.7 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Giuliano Procida via Libabigail From: Giuliano Procida Reply-To: Giuliano Procida Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" 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 --- 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;