From patchwork Sat Jan 7 00:51:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 62827 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 8639F3858D35 for ; Sat, 7 Jan 2023 00:51:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8639F3858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673052717; bh=r8rwjtO/u0BgI/k4Wde53UFeqkKDJyOhOyRCHwNKKxk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=I9hD2ITOCXI6QLeSTtuk6AL8nIJckbeDFXsatbXJS98GLaHVW3tShlbxIUVZ+Eu8b wzTNRphaqJd3+a28w3pTzOEffESoF2jyc4yMvsvGkaFevWhP25zCnQ6xh1fwpAMwiJ 7bNeNG2llWxE5IWEynrWHRuanWhVQdX2wXx/H3XA= 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.133.124]) by sourceware.org (Postfix) with ESMTPS id 27EF73858D33 for ; Sat, 7 Jan 2023 00:51:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 27EF73858D33 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-100--nUwXxjgNm-VFU6CbnmN4A-1; Fri, 06 Jan 2023 19:51:50 -0500 X-MC-Unique: -nUwXxjgNm-VFU6CbnmN4A-1 Received: by mail-qt1-f198.google.com with SMTP id a13-20020ac8610d000000b003a8151cadebso1451923qtm.10 for ; Fri, 06 Jan 2023 16:51:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:date:organization:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=r8rwjtO/u0BgI/k4Wde53UFeqkKDJyOhOyRCHwNKKxk=; b=QlPkgphQaOeE+UFwU2SXXPruw4irBisUZLAhJ8CUheuziWPpxNZTGXnuDWwi2F4H6i F3U94DH0EO198J3MERL7GZ39wM5sxMz9HgUSnHYGntn75hEvBzzZUa2enHtpVgSPSC2i w4SudQZkhc+i719kSDxHel4QxZxjwtjiMEnKcrjNxFsD+ZxgbqrOA6wZMK1zi2yEJpsK n2HYTaYMJRGY5T+1fC47wUV+WlqR3vpFssnlJFxt02C4moLQTR/jmbvj9+p+yXsTn70e Bm8mvaPdkH3yZyY/sHvAPWnAO5niumRl1Vh7FWcE9x2aschdbxrXifsHSi2qdR8QedX2 TQCg== X-Gm-Message-State: AFqh2koYVIUGeqfMJPj1TvTlWOBqddcn1oTJXJ5PwiQelEFbAQQ6cjWo tfTkknrRa6tmOh0FqFiYVd4Veil4ObMLbMweCbV12BKccnXMvbpFEnE+BuDU8/4JUBJ72/VIJZK f10kEkJzkOP96hu6eBeT5FbPYZF1etTiiwC8zBun5uU+h4Nmf0RzLWDUEx28iZhFi7+sJ X-Received: by 2002:ac8:7389:0:b0:3a5:264c:5f38 with SMTP id t9-20020ac87389000000b003a5264c5f38mr88634400qtp.63.1673052709876; Fri, 06 Jan 2023 16:51:49 -0800 (PST) X-Google-Smtp-Source: AMrXdXvXlDmzP2Two0+SVvo991S07zyAZRpndBzoQ0UL8c+0zsSH4PvXRIjZpEW5MuWDRObJCxTdEw== X-Received: by 2002:ac8:7389:0:b0:3a5:264c:5f38 with SMTP id t9-20020ac87389000000b003a5264c5f38mr88634379qtp.63.1673052709521; Fri, 06 Jan 2023 16:51:49 -0800 (PST) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id do25-20020a05620a2b1900b006fc94f65417sm1396818qkb.40.2023.01.06.16.51.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Jan 2023 16:51:49 -0800 (PST) Received: by localhost (Postfix, from userid 1000) id 74497581C59; Sat, 7 Jan 2023 01:51:47 +0100 (CET) To: libabigail@sourceware.org Subject: [PATCH, applied] btf-reader: Use abigail::ir::canonicalize_types to canonicalize types Organization: Red Hat / France X-Operating-System: Fedora 38 X-URL: http://www.redhat.com Date: Sat, 07 Jan 2023 01:51:47 +0100 Message-ID: <87h6x3kvz0.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.6 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_H2, 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.29 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 Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" Hello, In the btf::reader::canonicalize_types function, this patch now uses the abigail::ir::canonicalize_types() function to canonicalize types, just like the other front-ends. The advantage of this function is that it can perform some sanity checking for type canonicalization that might be useful for later debugging purposes. * src/abg-btf-reader.cc (btf::reader::canonicalize_types): Use the abigail::ir::canonicalize_types function from abg-ir-priv.h file to canonicalize types. Signed-off-by: Dodji Seketeli --- src/abg-btf-reader.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/abg-btf-reader.cc b/src/abg-btf-reader.cc index abab0f66..2c009aee 100644 --- a/src/abg-btf-reader.cc +++ b/src/abg-btf-reader.cc @@ -19,6 +19,7 @@ #include #include "abg-elf-helpers.h" +#include "abg-ir-priv.h" // ABG_BEGIN_EXPORT_DECLARATIONS @@ -180,12 +181,15 @@ class reader : public elf_based_reader {types_to_canonicalize_.push_back(t);} /// Canonicalize all the types scheduled for canonicalization using - /// schedule_type_for_canonocalization(). + /// abigail::ir::canonicalize_types() which performs some sanity + /// checking around type canonicalization if necessary. void canonicalize_types() { - for (auto t : types_to_canonicalize_) - canonicalize(t); + ir::canonicalize_types(types_to_canonicalize_.begin(), + types_to_canonicalize_.end(), + [](const vector::const_iterator& i) + {return *i;}); } uint64_t