From patchwork Thu Jul 30 18:31:33 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 140296 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2FEAB4BB8F4A for ; Thu, 30 Jul 2026 18:31:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2FEAB4BB8F4A X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by sourceware.org (Postfix) with ESMTPS id 61AF84BB8F4A for ; Thu, 30 Jul 2026 18:31:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 61AF84BB8F4A Authentication-Results: sourceware.org; dmarc=fail (p=quarantine dis=none) header.from=seketeli.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 61AF84BB8F4A Authentication-Results: sourceware.org; arc=none smtp.remote-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1785436296; cv=none; b=sYG+uLbbwi+FtE2/T/zd/1cJDyvkxJ2bvT8xs8u/wQ/ilXkwShv9w2tRmQaKdXl35QvZokHoEAob89QghPkXHCj0ZaIwPIlWb1Te97/bC9bbh4byI3YUcBfCx20twe56V2nbQCT4CiPpkY3Tu+KB+T7TOvWJgMGWqpuihslJG68= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1785436296; c=relaxed/simple; bh=LEh3Ap3GlacVF0WXiHw5I4ZIho8GD1vPecrNiPeKXG8=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=w9Sw2z9Hv25gOD/FvU304gZ/E57rL2a2ZdGZb9MAfr5sZmdRm/vZHzscJteGSq8eXSTDk7RbE+RLMfma5e2W0cVtrRKRxWoBwaXJ4w2iYyU4EIu3l5yzp/nHk8lvk7sFZP9OwmOYCC3v2J9jcv4UZH232OWAgoI8mH0q7tN65HU= ARC-Authentication-Results: i=1; sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 61AF84BB8F4A Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-4954df200ddso732585e9.0 for ; Thu, 30 Jul 2026 11:31:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785436295; x=1786041095; h=content-type:mime-version:user-agent:message-id:date:organization :subject:to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=bs6FCJ+xzvJprpKl0iVB1TnGNTGsxhZF7RWCXkRRBuk=; b=FEf+9hRYwytWMrVhjwpFS8VF0pLe97P+OeWVk/twIAxUWRh/5wDibCkDe7DhbOTKeY ArC6IK5uLjVXUzAkjMcf3sTuYK7F/5yv6A42zL5FPG29IBv0AND46UexBNJQdwvu1Q9y btaad5ON9E+hedU7O9NGeQFTfj6SLt+j1h6EoSIV1TKPI/iqVH+pwgBe40YtjuZFBcUz flkODfB6dQAFGAxDziTdPDSO5FcSHClU5b2JE/xlCvns3ec0nyCiDnsBXrOtG+vTe06K 8PPpfot2G4J4db4ez5rIpu+kMIGPtrjSV4NmCsZSh1ela8bI6ZwevOogJOt4W3/2oLr9 iylQ== X-Gm-Message-State: AOJu0YxvJ4sbiZ8gLpzrsgfm8Jlq0QuRfvw1LpvWMKRFubzBwsb5rB9U pDuoV0F3Rmy6IdR6eb5sezJ2tdu3iTa36SwnEb6o873Poyf3+pbLYMHGYTHgICss X-Gm-Gg: AR+sD11F/qyWvBgyaDyLOa28H6FHij1NRgU+buCfDJgMKojqPx3ucgAcuJSCihXwUY1 dNT9JlM9JaAS2do1Gfz9whszj+wjyvEbb8FUiEl7jE1KD7svjtfdJwxOAHRAw86Fo8ffetPirlJ qjxDrVGYc2tmGnOCf8+k55ufUAVCuQroorLMAHpTEXPc3H3sfLG1Lys9bwZde1C2gwb1oYl3eyP O7bYC3xqqu0Q5xG+U2OaQYep5V8kDImA2FT5E2NK8swTmVNJSOFjIBW285kmvhl9LIjq3qNbN+F tWEaEy+K0FiROryKi3a+NPtYhTKSf5WzXzkknG/wAh6CziXO4DPctfbO94y3GUPxVyX3394Rq7p ExKnJXb6r/osLo+kSyM4FDzylZxsJsKVeiwhi2b5y5RJsXhRN6JFT7DvCJVuzp5QYUFkLIk2BYC MAtR6O/jpP6qU1gS5qAJieU54Y7Hs2XPQyNoRIaKy1xDrcZ4wBWpZlIZdjmP2vo+aPdTBry2lW7 vUh3JvF/FMv3q6+SyO8sAldkHYzbYVfezbjtBVF4rk= X-Received: by 2002:a05:6000:4383:b0:47f:9254:d45c with SMTP id ffacd0b85a97d-47fc82305a5mr6064466f8f.31.1785436295133; Thu, 30 Jul 2026 11:31:35 -0700 (PDT) Received: from localhost ([82.67.74.110]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fc892cdeasm8514209f8f.22.2026.07.30.11.31.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 11:31:34 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id BC6C36058B8A; Thu, 30 Jul 2026 20:31:33 +0200 (CEST) From: Dodji Seketeli To: libabigail@sourceware.org Subject: [PATCH 2/3] ir: remove unused enum_has_non_name_change Organization: Me, myself and I X-Operating-System: Fedora 45 X-URL: http://www.seketeli.net/~dodji Date: Thu, 30 Jul 2026 20:31:33 +0200 Message-ID: <87fr10nxbu.fsf@seketeli.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Spam-Status: No, score=-5.9 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, LOCAL_AUTHENTICATION_FAIL_DMARC, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on 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-Post: List-Help: List-Subscribe: , Errors-To: libabigail-bounces~patchwork=sourceware.org@sourceware.org Hello, It feels good to remove unused code. * include/abg-ir.h (class enum_type_decl): Remove friend declaration of enum_has_non_name_change. (enum_has_non_name_change): Remove declaration. * src/abg-ir.cc (enum_has_non_name_change): Remove definition. Signed-off-by: Dodji Seketeli Applied to the master branch. --- include/abg-ir.h | 10 ------ src/abg-ir.cc | 79 ------------------------------------------------ 2 files changed, 89 deletions(-) diff --git a/include/abg-ir.h b/include/abg-ir.h index 84dd2939..c5840d04 100644 --- a/include/abg-ir.h +++ b/include/abg-ir.h @@ -2858,11 +2858,6 @@ public: traverse(ir_node_visitor& v); virtual ~enum_type_decl(); - - friend bool - enum_has_non_name_change(const enum_type_decl& l, - const enum_type_decl& r, - change_kind* k); }; // end class enum_type_decl bool @@ -2871,11 +2866,6 @@ operator==(const enum_type_decl_sptr& l, const enum_type_decl_sptr& r); bool operator!=(const enum_type_decl_sptr& l, const enum_type_decl_sptr& r); -bool -enum_has_non_name_change(const enum_type_decl& l, - const enum_type_decl& r, - change_kind* k); - /// The abstraction of an enumerator class enum_type_decl::enumerator { diff --git a/src/abg-ir.cc b/src/abg-ir.cc index 2e9d2084..d9230404 100644 --- a/src/abg-ir.cc +++ b/src/abg-ir.cc @@ -20470,85 +20470,6 @@ enum_type_decl::traverse(ir_node_visitor &v) enum_type_decl::~enum_type_decl() {} -/// Test if two enums differ, but not by a name change. -/// -/// @param l the first enum to consider. -/// -/// @param r the second enum to consider. -/// -/// @return true iff @p l differs from @p r by anything but a name -/// change. -bool -enum_has_non_name_change(const enum_type_decl& l, - const enum_type_decl& r, - change_kind* k) -{ - bool result = false; - if (*l.get_underlying_type() != *r.get_underlying_type()) - { - result = true; - if (k) - *k |= SUBTYPE_CHANGE_KIND; - else - return true; - } - - enum_type_decl::enumerators::const_iterator i, j; - for (i = l.get_enumerators().begin(), j = r.get_enumerators().begin(); - i != l.get_enumerators().end() && j != r.get_enumerators().end(); - ++i, ++j) - if (*i != *j) - { - result = true; - if (k) - { - *k |= LOCAL_TYPE_CHANGE_KIND; - break; - } - else - return true; - } - - if (i != l.get_enumerators().end() || j != r.get_enumerators().end()) - { - result = true; - if (k) - *k |= LOCAL_TYPE_CHANGE_KIND; - else - return true; - } - - enum_type_decl &local_r = const_cast(r); - interned_string qn_r = l.get_environment().intern(r.get_qualified_name()); - interned_string qn_l = l.get_environment().intern(l.get_qualified_name()); - string n_l = l.get_name(); - string n_r = r.get_name(); - local_r.set_qualified_name(qn_l); - local_r.set_name(n_l); - - if (!(l.decl_base::operator==(r) && l.type_base::operator==(r))) - { - result = true; - if (k) - { - if (!l.decl_base::operator==(r)) - *k |= LOCAL_NON_TYPE_CHANGE_KIND; - if (!l.type_base::operator==(r)) - *k |= LOCAL_TYPE_CHANGE_KIND; - } - else - { - local_r.set_name(n_r); - local_r.set_qualified_name(qn_r); - return true; - } - } - local_r.set_qualified_name(qn_r); - local_r.set_name(n_r); - - return result; -} - /// Test if a given enumerator is found present in an enum. /// /// This is a subroutine of the equals function for enums.