From patchwork Wed Feb 12 17:16:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 106390 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 155EC3858403 for ; Wed, 12 Feb 2025 17:16:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 155EC3858403 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Cang1u6r 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 ESMTP id 976B53858403 for ; Wed, 12 Feb 2025 17:16:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 976B53858403 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 976B53858403 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739380591; cv=none; b=TJiOzuX68WISUoYVzGQoG7Ea7N5wjnHR/SHh4QrjnJgBwMJvdTZraJHAUA5wa9MTgQPeIyyBKzylYP7hZpEj7tNYjZB8Za8yWP+hfKoVIOeifUjUDkaLQuQJIeEeD1WM0wNzeeN3Zk4ZqNly55u8fBn35OVXWO+78qonn0e8H14= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739380591; c=relaxed/simple; bh=xNZpeQ3K3NBbwUEJGpZt60SXMFGo/ct+JDayMTCimMg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=bQfJRjwkfG9rw9Uh8sVI8bLbOUshqp4P5CbHdcbWvL9zAqrQG6PzcarqgKZKz9s1YQCYIK35rsMymcgBszAuO8vuk/uZJ1hsOOByIIj/q8IClmff/ZQVd68jZVbQHk3CnsemIKeQd546AWhCkKdzzURXBKPU/Aeijl6Ta8aBX+c= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 976B53858403 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739380591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=tKgWkwe9rpO1oLXrCVLt2qrr0e5Y4EU52fuyAXPYfFg=; b=Cang1u6rdKo9ntas9qZ2zZpqGKesQpbphvZh+Iyk7AFzhA1QOGmeqjz/tRh8wTxCdx5mIa fnKYwTBweKJCQS7om62c8en3WmM01ejxV7aplsMb6J1V0THIuSgiWrA8vDmkx0YG2RzYJq iSOiII2oL0oFjSsPi3UNfYMQpz2jb3U= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-108-gsZQmasWM-Ke_n4wByvsPQ-1; Wed, 12 Feb 2025 12:16:29 -0500 X-MC-Unique: gsZQmasWM-Ke_n4wByvsPQ-1 X-Mimecast-MFC-AGG-ID: gsZQmasWM-Ke_n4wByvsPQ_1739380588 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4392fc6bd21so21288725e9.1 for ; Wed, 12 Feb 2025 09:16:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739380588; x=1739985388; 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=tKgWkwe9rpO1oLXrCVLt2qrr0e5Y4EU52fuyAXPYfFg=; b=KYIe/S+nO72qL1G9CMLWyGlPb9Lo6AncFPMngTwEhIpiILgy/7mOhWFOv1eq0RC8UH I9EU1iePeCSg6kFKkMZkBPOCqBX5irX3w7M6Z06GrbfM491TOEOy2Vp9iue/p7gKDqyO jOcFhnpCgtf3jUumbPMK/XxH7+/dA/1O7QB4vTb0N915+lXxnqjz+3ix71UIw5ixsPJA 2zjlRm1H7UJB60k49UZXOHiCZRzCpUqzgHZv7icBJu5U70OlZSC93/FjsEVUlkRctIvK 1Ztx4L8g5Y1Kx2Czt19Gt+3SJrvNJED5FFSTcfhCpyeIhxRcBSXOxsWm80W9FQmo7hJg MTIQ== X-Gm-Message-State: AOJu0YyqXzoGLWw951sHDgCoUYPynr7EamsenjGfPEyuKv3Xc4qZdoZ6 RoZ6B3Pi4ZljWLJ+u0hpqCH9m03vSbR3/JjGbGYuvH2NGxDkUC/vNdNkl4NUt36QUd1hoh0q4WV G3FIjDClesFGmCy4F1tbLEoe69qx/XBjYZ57O+MDDv2SxexOM3ByN1mRZaUkd5ka8T1PYGTjEpx ExAzX0k0CcptW3ufnVMkxbmzTnwt4J7Bxsraynvg== X-Gm-Gg: ASbGnct32PyrGMyj+zex/jZuOxcPboGeobwvQ1wQe297ngyworuIbTa1Zrd3eqQzSV5 fVI264ys/gFWa3Hz/WYCRhbHx2t4bxO58h//zb7qGtA6uYTnQyBjhBTiB4maEIBiKfEgUGnZWgI V2/Vyvlu1NEuyX7rPZDCMtDeof//fS2FmTz2NTPDBMIBRmrmysMAZaOwn8cWKZ4zIPm8nr3WWGd ZQToHO8rKLxPF7KBOvYC14v916zWQw/3EuR0oI+TwIzML+qmKQIR+alLwfbQCm/EFUlMzhtNZX4 n/kraBL/tiW2CxJZh/hNW/a+RJE= X-Received: by 2002:a05:600c:3b03:b0:439:4d48:1e63 with SMTP id 5b1f17b1804b1-4395818932dmr42939085e9.17.1739380587627; Wed, 12 Feb 2025 09:16:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IGquSB6BtlQHV9mFgUwVElX3KmVe9+q2mhX6duPqMUmfG4kNPj1MODz1df0mEYp0YNGukqJTQ== X-Received: by 2002:a05:600c:3b03:b0:439:4d48:1e63 with SMTP id 5b1f17b1804b1-4395818932dmr42938605e9.17.1739380587121; Wed, 12 Feb 2025 09:16:27 -0800 (PST) Received: from localhost (88-120-130-27.subs.proxad.net. [88.120.130.27]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4395a1aa6f7sm25107735e9.32.2025.02.12.09.16.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 09:16:25 -0800 (PST) Received: by localhost (Postfix, from userid 1000) id 101375077C4C; Wed, 12 Feb 2025 18:16:25 +0100 (CET) From: Dodji Seketeli To: libabigail@sourceware.org Subject: [PATCH applied] {ctf,dwarf}-reader.cc: Fix a virtual method name conflict in elf_base_reader Organization: Red Hat / France X-Operating-System: AlmaLinux 9.5 X-URL: http://www.redhat.com Date: Wed, 12 Feb 2025 18:16:25 +0100 Message-ID: <87msergk2e.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-MFC-PROC-ID: K_q2a4tjQY16nup5J5IWMa_WOqW-fSxdazMjA4WIfjM_1739380588 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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.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, GCC 15 (rightfully) complains about a new {ctf,dwarf}::reader::initialize method that shadows existing elf_base_reader::initialize methods with a different parameters set. This patch fixes that issue by renaming that dwarf::reader::initialize method into dwarf::reader::reset. * src/abg-ctf-reader.cc (ctf::reader::initialize): Adjust. (ctf::reader::reset): Rename ctf::reader::initialize into this. * src/abg-dwarf-reader.cc (reader::initialize): Adjust. (dwarf::reader::reset): Rename dwarf::reader::initialize into this. Signed-off-by: Dodji Seketeli Applied to mainline. --- src/abg-ctf-reader.cc | 6 +++--- src/abg-dwarf-reader.cc | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/abg-ctf-reader.cc b/src/abg-ctf-reader.cc index 1997c6d1..52745f62 100644 --- a/src/abg-ctf-reader.cc +++ b/src/abg-ctf-reader.cc @@ -266,7 +266,7 @@ public: : elf_based_reader(elf_path, debug_info_root_paths, env), ctfa(), ctf_sect(), symtab_sect(), strtab_sect() { - initialize(); + reset(); } /// Initializer of the reader. @@ -282,7 +282,7 @@ public: /// the context uses resources that are allocated in the /// environment. void - initialize() + reset() { types_to_canonicalize.clear(); cur_tu_.reset(); @@ -315,7 +315,7 @@ public: bool load_all_types = false, bool linux_kernel_mode = false) { - initialize(); + reset(); load_all_types = load_all_types; linux_kernel_mode = linux_kernel_mode; elf_based_reader::initialize(elf_path, debug_info_root_paths); diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index 66fa3e82..d9a55325 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -2119,7 +2119,7 @@ protected: debug_info_root_paths, environment) { - initialize(load_all_types, linux_kernel_mode); + reset(load_all_types, linux_kernel_mode); } /// Clear the statistics for reading the current corpus. @@ -2144,7 +2144,7 @@ public: /// special linux kernel symbol tables when determining if a symbol /// is exported or not. void - initialize(bool load_all_types, bool linux_kernel_mode) + reset(bool load_all_types, bool linux_kernel_mode) { dwarf_version_ = 0; cur_tu_die_ = 0; @@ -2217,7 +2217,7 @@ public: bool linux_kernel_mode) { elf_based_reader::initialize(elf_path, debug_info_root_paths); - initialize(load_all_types, linux_kernel_mode); + reset(load_all_types, linux_kernel_mode); } /// Create an instance of DWARF Reader.