From patchwork Wed Oct 4 10:52:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 77090 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 21B753858CDB for ; Wed, 4 Oct 2023 10:52:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 21B753858CDB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1696416772; bh=Jh8JJqAdsj/RCBNqhA4dP0ZtsUQkAcGjEWnWe3mhtqI=; h=To:Subject:References:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=dAvktdK2oO1WxWQc8GliRDswWe/ifYe/bvACxJUYSfXW/F/p+/ZtiJ0UMqjti2clz t7Hf9x7Evozxt7P1qCe8L2EAcMNsADypNMoPM4lUp3MWo63AezFUhyPSJqiWbaD394 XH0C95LZhqjIhyHZv9hXb05xhNFBnfQFIWlzV2U8= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org 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 14386385841B for ; Wed, 4 Oct 2023 10:52:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 14386385841B Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-499-zG5gFBM3MwysP4POcoX20A-1; Wed, 04 Oct 2023 06:52:45 -0400 X-MC-Unique: zG5gFBM3MwysP4POcoX20A-1 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7740c0e88ffso231835285a.1 for ; Wed, 04 Oct 2023 03:52:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696416765; x=1697021565; h=mime-version:user-agent:message-id:in-reply-to:date:references :organization:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Jh8JJqAdsj/RCBNqhA4dP0ZtsUQkAcGjEWnWe3mhtqI=; b=wf2fJ//gW8IDWN+bBxmhrXkcuMgxDydK1RsU6J7y7niVEnH6+VjuzrLIMw2kGhYLyW z0p1iIVDjuV11EHjBvIWTThnwZLY3SfqclEHVVRue5dxuU9p7M5JNoKD6oE20ox5+tdh TQq801UUvljotXMuAvKH3Facs+Vw3lvNd0lvSwm0T57cqkRpCqPS6Xmfr8PCDRiFDICb I52E1fIDduhGj3XhMyr5GRoT3A2THeTKM5Nv01yr4+1+h6VtSeKs+zFrp5L2hKSzuAmN xQwwaUy2P2B/GBbV58lsPdTU7dBWcbE0f9wVXDR0HJij+O+fvBa6NLRE5SmymWokk8RP ir/A== X-Gm-Message-State: AOJu0YxX/PIhurRNJP5HhGg152Zg5ipjXXNXfkhy/I/ovQPK6MVj7QfS jqta5u2pItm5c5uY8FElyHuJpT3kXaAgG8XLDLmsIx2nMaFcrGK9HErAY5P4lXfIbJjFmLQ7Pg4 qXR5CE/NcC7T5Rb50NYrQ X-Received: by 2002:a05:620a:21cc:b0:76f:1e31:93cd with SMTP id h12-20020a05620a21cc00b0076f1e3193cdmr2044289qka.43.1696416765021; Wed, 04 Oct 2023 03:52:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGcBJ/0bWrgStkFfzeZXMRdvPVbGlIaaDi7sWA2ZDkiRz4a+SGxQV7YTBng277zxvj2nVhG2w== X-Received: by 2002:a05:620a:21cc:b0:76f:1e31:93cd with SMTP id h12-20020a05620a21cc00b0076f1e3193cdmr2044279qka.43.1696416764773; Wed, 04 Oct 2023 03:52:44 -0700 (PDT) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id f22-20020a05620a12f600b00767c961eb47sm1167125qkl.43.2023.10.04.03.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 03:52:44 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id 03CB1B6EB1; Wed, 4 Oct 2023 12:52:41 +0200 (CEST) To: libabigail@sourceware.org Subject: [PATCH 1/3, V2] For WIP branch check-uapi-support: default-reporter,reporter-priv: Do not report names of anonymous enums Organization: Red Hat / France References: <87r0mapspt.fsf@redhat.com> X-Operating-System: CentOS Stream release 9 X-URL: http://www.redhat.com Date: Wed, 04 Oct 2023 12:52:41 +0200 In-Reply-To: <87r0mapspt.fsf@redhat.com> (Dodji Seketeli's message of "Wed, 04 Oct 2023 12:50:06 +0200") Message-ID: <87mswypsli.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.9 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_H4, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Dodji Seketeli via Libabigail From: Dodji Seketeli Reply-To: Dodji Seketeli Cc: Trilok Soni , dodji@redhat.com, Satya Durga Srinivasu Prabhala Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" Hello, When reporting changes of anonymous enums, do not try to report their qualified name as that doesn't make any sense -- they are anonymous. Similarly, in report_name_size_and_alignment_changes do not try to report about changes in the name of an anonymous enum. * src/abg-default-reporter.cc (default_reporter::report): In the overload for enum_diff, do not get the qualified name of anonymous enums. * src/abg-reporter-priv.cc (report_name_size_and_alignment_changes): Do not report about name changes for anonymous enums. Signed-off-by: Dodji Seketeli --- src/abg-default-reporter.cc | 12 +++++++++--- src/abg-reporter-priv.cc | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc index b1df9300..c71f8d56 100644 --- a/src/abg-default-reporter.cc +++ b/src/abg-default-reporter.cc @@ -162,7 +162,9 @@ default_reporter::report(const enum_diff& d, ostream& out, { out << indent << " '" - << i->get_qualified_name() + << (first->get_is_anonymous() + ? i->get_name() + : i->get_qualified_name()) << "' value '" << i->get_value() << "'"; @@ -181,7 +183,9 @@ default_reporter::report(const enum_diff& d, ostream& out, { out << indent << " '" - << i->get_qualified_name() + << (second->get_is_anonymous() + ? i->get_name() + :i->get_qualified_name()) << "' value '" << i->get_value() << "'"; @@ -201,7 +205,9 @@ default_reporter::report(const enum_diff& d, ostream& out, { out << indent << " '" - << i->first.get_qualified_name() + << (first->get_is_anonymous() + ? i->first.get_name() + : i->first.get_qualified_name()) << "' from value '" << i->first.get_value() << "' to '" << i->second.get_value() << "'"; diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc index 63a45b80..cc38f240 100644 --- a/src/abg-reporter-priv.cc +++ b/src/abg-reporter-priv.cc @@ -965,7 +965,8 @@ report_name_size_and_alignment_changes(decl_base_sptr first, string fn = first->get_qualified_name(), sn = second->get_qualified_name(); - if (fn != sn) + if (!(first->get_is_anonymous() && second->get_is_anonymous()) + && fn != sn) { if (!(ctxt->get_allowed_category() & HARMLESS_DECL_NAME_CHANGE_CATEGORY) && filtering::has_harmless_name_change(first, second))