From patchwork Mon Mar 13 17:04:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 66307 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 10C1E3858D39 for ; Mon, 13 Mar 2023 17:04:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 10C1E3858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678727096; bh=+nCZP7weUu9k7ZHcJ1gyU/PTZkdJnxFHwteCgZC/NSA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=E6lNj3wyk/Mh2/0lj3zHHGY9CjiEyp6B9dygQCgiISEu5IRBjH+Mk8+dTR+jThcxW y3jEmGRN2LebU0jV8SQPzs+F2o3kMty5JTYO7AiLZZ4VMbLwrWRv1+cgHMzBXbFUC5 +b7ohs7IoxS+haL00wxqtxJjuXLBObRHoeP8VTdk= 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 1805F3858D1E for ; Mon, 13 Mar 2023 17:04:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1805F3858D1E Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-44-6-Z0E-bXOMGUp7mq5-JU4g-1; Mon, 13 Mar 2023 13:04:48 -0400 X-MC-Unique: 6-Z0E-bXOMGUp7mq5-JU4g-1 Received: by mail-qv1-f71.google.com with SMTP id dl18-20020ad44e12000000b005a4d5420bc6so2448604qvb.11 for ; Mon, 13 Mar 2023 10:04:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678727088; 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=+nCZP7weUu9k7ZHcJ1gyU/PTZkdJnxFHwteCgZC/NSA=; b=hJUsdtz/Opj57aYGfDKMjtWcCe9pG0rbGVUxXZwNq/TpqFCoB1GPWjlzF3yiWT4IXA 9zhn0mKG6rCKBhW68sZUSTgAxQauWRAhUjcUIUA5755AglmaduXjgP3i2QCwUuTg/654 bcVcz5zoV26m3lHZQv4WrRAneap5DVE21H7CsZCu1BaaNSVO/fb9HXqct59JP7CiX/u5 rbIr9JL0V4Wy4FMOzOAv+9TiorolLXmhRReqGKfJQTq0UcOwT28RI04kxu5wHW7qIBS1 hSQRgeW6WZXKu1GPYlmb13S27t7PeF+XCBTEd0DlB8JOVd+J4YI5XkMpRE5hsic12gz3 v3Cg== X-Gm-Message-State: AO0yUKWgnLOejb3yRGGK4ec9jIxAfPWsu2U74NA0XBb3/muoFUUPOnj4 TySTaP+Q9jlSCnwtxpxDzmzdRlMmnEfRnPFYVnZncR6BASTaVjvIrxjFTt2LdZtLHi11duKkVLW VKm8aPjL1/Cxiru/tyG4vCOMNTht4dssu9SkxVN/MSc2tsmtVJl9KhRL5tK62SHhnwunk+de7Tx 0h X-Received: by 2002:a05:622a:13ca:b0:3c0:3be7:8c91 with SMTP id p10-20020a05622a13ca00b003c03be78c91mr41948834qtk.37.1678727088084; Mon, 13 Mar 2023 10:04:48 -0700 (PDT) X-Google-Smtp-Source: AK7set8sMi7719+JzevB1zO4YmicUUMLHmChGtcABz/tNMyB3hLpovD7SHuxxulLfBOZ5DeV1uhJuA== X-Received: by 2002:a05:622a:13ca:b0:3c0:3be7:8c91 with SMTP id p10-20020a05622a13ca00b003c03be78c91mr41948788qtk.37.1678727087734; Mon, 13 Mar 2023 10:04:47 -0700 (PDT) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id f15-20020ac8470f000000b003bfc0cca1b7sm173073qtp.49.2023.03.13.10.04.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 10:04:47 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id 95331581C79; Mon, 13 Mar 2023 18:04:45 +0100 (CET) To: libabigail@sourceware.org Subject: [PATCH, applied] dwarf-reader,abidiff: Fix compilation with --enable-debug-type-canonicalization Organization: Red Hat / France X-Operating-System: Fedora 38 X-URL: http://www.redhat.com Date: Mon, 13 Mar 2023 18:04:45 +0100 Message-ID: <87cz5coa4y.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.8 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, When looking at something else, I configured the package with --enable-debug-type-canonicalization and surprise, there were some compilation errors. Fixed thus. * src/abg-dwarf-reader.cc (reader::initialize): Use env(). rather than environment->. * tools/abidiff.cc (options::options): Initialize do_debug_type_canonicalization() before use_btf. Signed-off-by: Dodji Seketeli --- src/abg-dwarf-reader.cc | 2 +- tools/abidiff.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index 113dbdcb..037538af 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -1976,7 +1976,7 @@ public: options().load_all_types = load_all_types; #ifdef WITH_DEBUG_TYPE_CANONICALIZATION debug_die_canonicalization_is_on_ = - environment->debug_die_canonicalization_is_on(); + env().debug_die_canonicalization_is_on(); use_canonical_die_comparison_ = true; #endif compare_count_ = 0; diff --git a/tools/abidiff.cc b/tools/abidiff.cc index 3613a4a3..d2fa5b63 100644 --- a/tools/abidiff.cc +++ b/tools/abidiff.cc @@ -175,6 +175,10 @@ struct options dump_diff_tree(), show_stats(), do_log() +#ifdef WITH_DEBUG_TYPE_CANONICALIZATION + , + do_debug_type_canonicalization() +#endif #ifdef WITH_CTF , use_ctf() @@ -186,10 +190,6 @@ struct options #ifdef WITH_DEBUG_SELF_COMPARISON , do_debug_self_comparison() -#endif -#ifdef WITH_DEBUG_TYPE_CANONICALIZATION - , - do_debug_type_canonicalization() #endif {}