From patchwork Wed Jun 10 11:59:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 39551 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 E0800386EC42; Wed, 10 Jun 2020 11:59:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E0800386EC42 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1591790398; bh=6L++CGzYQRk5yL3cZAHm/SWpBdIme3Cpjw9D4vffxgU=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=oLc62FShbJKMyM/3+CNzX2Aq+ccR9xMUDvdGnho6ZkzsO7WlYullGDFV9xf1uXe54 2BVjPau7x6TN2wf+7xp/f1z3yiQY3tqd4lOJXr09xlZBHqvEtcqn6LEGoGG74UHP2g N/tjSRH5FRfhYfw66ZQhvcB/Qcho2DLWfETLxJ1c= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by sourceware.org (Postfix) with ESMTPS id 86F0C3851C11 for ; Wed, 10 Jun 2020 11:59:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 86F0C3851C11 Received: by mail-yb1-xb4a.google.com with SMTP id r17so1894675ybj.22 for ; Wed, 10 Jun 2020 04:59:54 -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=6L++CGzYQRk5yL3cZAHm/SWpBdIme3Cpjw9D4vffxgU=; b=LdjE1fD2QvruNzpza157kysLHkq7ln7uY3oIeTqYHmOar3snOVVqSe3QN79AnpYzQJ nM1DAHNRUULONWDUsfBrjBE1S46PQhj1e0jzpyBrkZV67nnXTI8JdvYMmbq8+F2z7EW6 evuSl6y1SKnwQKly5dtF4WsGyxfsDSUHEbGWgDsEYBY7U+KkOHkMx0wa0Dkz8vfoGb+a gUAToekOhsp+ZSAUUllga+ZbtlwVqM58EzAyNr9RArEI4UDTj98ldbuUpuSEODesZp5A /TCrd9B2HZou5mtzQKNbnm8fZ7u5471R0DfnFm6R7EtuDNc7m0WdeE5DN11YS+6LIXPI tTKQ== X-Gm-Message-State: AOAM532m9qYF5I164JUf8o44VmIqADCPkKeQDR+zstpN30QfFCE6wuVC LqZrUsUhoePtOfKNfVeeImxF9mwPxduQ2mYhtn0UaJJHjHjr9ckYMg1exBFZcoPk6BwMMJ52vcV /0r/JjOHES6F1T4SpqXmRsJV4nIuELOzKXwJa4ZnQgbNKDsXk37MEw/8nJm7MPrLcTh/zfPI= X-Google-Smtp-Source: ABdhPJy1tXaf6/DvtcaG3KsKfVRpq/DJ+zuZF8OOppj8U7KS7fXcJcmHB3MdGG8QShWf/8KLjXUJrFMvYT5/gg== X-Received: by 2002:a25:d992:: with SMTP id q140mr5024020ybg.213.1591790393995; Wed, 10 Jun 2020 04:59:53 -0700 (PDT) Date: Wed, 10 Jun 2020 12:59:34 +0100 In-Reply-To: <20200610115940.26035-1-gprocida@google.com> Message-Id: <20200610115940.26035-6-gprocida@google.com> Mime-Version: 1.0 References: <20200610115940.26035-1-gprocida@google.com> X-Mailer: git-send-email 2.27.0.278.ge193c7cf3a9-goog Subject: [PATCH 05/11] Rename declaration-definition change category. To: libabigail@sourceware.org X-Spam-Status: No, score=-23.7 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_STOCKGEN, 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: kernel-team@android.com, gprocida@google.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" This patch renames CLASS_DECL_ONLY_DEF_CHANGE_CATEGORY to TYPE_DECL_ONLY_DEF_CHANGE_CATEGORY. Signed-off-by: Giuliano Procida --- include/abg-comparison.h | 10 +++++----- src/abg-comp-filter.cc | 2 +- src/abg-comparison.cc | 6 +++--- src/abg-default-reporter.cc | 2 +- src/abg-leaf-reporter.cc | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/abg-comparison.h b/include/abg-comparison.h index bb510a18..a46c7184 100644 --- a/include/abg-comparison.h +++ b/include/abg-comparison.h @@ -418,10 +418,9 @@ enum diff_category /// present as a child of a other nodes in the diff tree. REDUNDANT_CATEGORY = 1 << 13, - /// This means that a diff node in the sub-tree carries a class type - /// that was declaration-only and that is now defined, or vice - /// versa. - CLASS_DECL_ONLY_DEF_CHANGE_CATEGORY = 1 << 14, + /// This means that a diff node in the sub-tree carries a type that + /// was declaration-only and that is now defined, or vice versa. + TYPE_DECL_ONLY_DEF_CHANGE_CATEGORY = 1 << 14, /// A diff node in this category is a function parameter type which /// top cv-qualifiers change. @@ -447,6 +446,7 @@ enum diff_category /// array type of a global variable, but the ELF size of the /// variable didn't change. BENIGN_INFINITE_ARRAY_CHANGE_CATEGORY = 1 << 20, + /// A special enumerator that is the logical 'or' all the /// enumerators above. /// @@ -467,7 +467,7 @@ enum diff_category | SIZE_OR_OFFSET_CHANGE_CATEGORY | VIRTUAL_MEMBER_CHANGE_CATEGORY | REDUNDANT_CATEGORY - | CLASS_DECL_ONLY_DEF_CHANGE_CATEGORY + | TYPE_DECL_ONLY_DEF_CHANGE_CATEGORY | FN_PARM_TYPE_TOP_CV_CHANGE_CATEGORY | FN_PARM_TYPE_CV_CHANGE_CATEGORY | FN_RETURN_TYPE_CV_CHANGE_CATEGORY diff --git a/src/abg-comp-filter.cc b/src/abg-comp-filter.cc index 36fca73d..81548427 100644 --- a/src/abg-comp-filter.cc +++ b/src/abg-comp-filter.cc @@ -1518,7 +1518,7 @@ categorize_harmless_diff_node(diff *d, bool pre) s = is_decl(d->second_subject()); if (has_class_decl_only_def_change(d)) - category |= CLASS_DECL_ONLY_DEF_CHANGE_CATEGORY; + category |= TYPE_DECL_ONLY_DEF_CHANGE_CATEGORY; if (access_changed(f, s)) category |= ACCESS_CHANGE_CATEGORY; diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc index 857ffa8a..f77799f2 100644 --- a/src/abg-comparison.cc +++ b/src/abg-comparison.cc @@ -2957,7 +2957,7 @@ get_default_harmless_categories_bitmap() | abigail::comparison::HARMLESS_SYMBOL_ALIAS_CHANGE_CATEORY | abigail::comparison::HARMLESS_UNION_CHANGE_CATEGORY | abigail::comparison::HARMLESS_DATA_MEMBER_CHANGE_CATEGORY - | abigail::comparison::CLASS_DECL_ONLY_DEF_CHANGE_CATEGORY + | abigail::comparison::TYPE_DECL_ONLY_DEF_CHANGE_CATEGORY | abigail::comparison::FN_PARM_TYPE_TOP_CV_CHANGE_CATEGORY | abigail::comparison::FN_PARM_TYPE_CV_CHANGE_CATEGORY | abigail::comparison::FN_RETURN_TYPE_CV_CHANGE_CATEGORY @@ -3108,11 +3108,11 @@ operator<<(ostream& o, diff_category c) emitted_a_category |= true; } - if (c & CLASS_DECL_ONLY_DEF_CHANGE_CATEGORY) + if (c & TYPE_DECL_ONLY_DEF_CHANGE_CATEGORY) { if (emitted_a_category) o << "|"; - o << "CLASS_DECL_ONLY_DEF_CHANGE_CATEGORY"; + o << "TYPE_DECL_ONLY_DEF_CHANGE_CATEGORY"; emitted_a_category |= true; } diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc index 42851346..2acb6954 100644 --- a/src/abg-default-reporter.cc +++ b/src/abg-default-reporter.cc @@ -846,7 +846,7 @@ default_reporter::report(const class_or_union_diff& d, const diff_context_sptr& ctxt = d.context(); // Report class decl-only <-> definition change. - if (ctxt->get_allowed_category() & CLASS_DECL_ONLY_DEF_CHANGE_CATEGORY) + if (ctxt->get_allowed_category() & TYPE_DECL_ONLY_DEF_CHANGE_CATEGORY) if (filtering::has_class_decl_only_def_change(first, second)) { string was = diff --git a/src/abg-leaf-reporter.cc b/src/abg-leaf-reporter.cc index f9d905ab..37d0fde3 100644 --- a/src/abg-leaf-reporter.cc +++ b/src/abg-leaf-reporter.cc @@ -461,7 +461,7 @@ leaf_reporter::report(const class_or_union_diff& d, const diff_context_sptr& ctxt = d.context(); // Report class decl-only -> definition change. - if (ctxt->get_allowed_category() & CLASS_DECL_ONLY_DEF_CHANGE_CATEGORY) + if (ctxt->get_allowed_category() & TYPE_DECL_ONLY_DEF_CHANGE_CATEGORY) if (filtering::has_class_decl_only_def_change(first, second)) { string was =