| Message ID | 87ikhxhqsm.fsf@redhat.com |
|---|---|
| State | New |
| Headers |
Return-Path: <libabigail-bounces~patchwork=sourceware.org@sourceware.org> 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 E6CE43858C42 for <patchwork@sourceware.org>; Tue, 9 Sep 2025 06:47:06 +0000 (GMT) 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.129.124]) by sourceware.org (Postfix) with ESMTP id 866913858D1E for <libabigail@sourceware.org>; Tue, 9 Sep 2025 06:47:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 866913858D1E Authentication-Results: sourceware.org; dmarc=pass (p=quarantine 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 866913858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757400420; cv=none; b=HWhkj0pMQkZADauKUUarL/6irUP/FFgiZB5KLrvUXoOcoFuWKSmbHd2AIkeJhedSpTwLbBJkfItAplX7bajllyr4XYCE3hblR//ZlN6u0dJ5IrVCDHfZcgbFfn3M09/7WdpOnNusWfy2SmEqPus6+02hu62at+kWXTE13wqueyU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757400420; c=relaxed/simple; bh=3D/+iCiKfnpt1CUoysctBfbU+QYHYnyGbMBA4J0dExQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=e0N+Ygg+KI2M+xB1Rbo1+qKjjTv4b54HXBG5RGykI5m5yStD1AE3/nSjSuh8SL0WzeB/oxjYFZAaVGMd5jRbCKpzX/uqtsHuoKm1IxrwNLgTTx38tU5WZtoCegWPKXR3oG914XW96w4k+gOqpCb7i5zVz3ZRyOYUX2vn6dUaFyI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 866913858D1E 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=Br0pYrDC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1757400420; 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=Gxt+YDHEY98Z8W8j7nUOq9j5UiC9Nt2+t0bhRjFOW6o=; b=Br0pYrDCWymmDrE2uhdzQK0Oa390htz3CdSZgdIsbAPD0wB7D2R3qj/tefOx1EpJ9Oqxe1 i34HQOxr7U7a7PNp3vyIFBJDGdHgTybjG7leWprXzs5UCfaeZa/XN0anTmvv5JfQmmFVg0 fX1fiu6X/dzwcH9aBDRNuUeeGHsF5OE= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-683-DRklymrsNRqXDOBCKC77tQ-1; Tue, 09 Sep 2025 02:46:58 -0400 X-MC-Unique: DRklymrsNRqXDOBCKC77tQ-1 X-Mimecast-MFC-AGG-ID: DRklymrsNRqXDOBCKC77tQ_1757400418 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1E3FE1800576 for <libabigail@sourceware.org>; Tue, 9 Sep 2025 06:46:58 +0000 (UTC) Received: from localhost (unknown [10.44.22.20]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C8A3D30001A4 for <libabigail@sourceware.org>; Tue, 9 Sep 2025 06:46:57 +0000 (UTC) Received: by localhost (Postfix, from userid 1000) id D2E2C6038449; Fri, 05 Sep 2025 17:17:45 +0200 (CEST) From: Dodji Seketeli <dodji@redhat.com> To: libabigail@sourceware.org Subject: [PATCH, applied] dwarf-reader: Fix reader::merge_member_functions_of_classes Organization: Red Hat / France X-Operating-System: Fedora 42 X-URL: http://www.redhat.com Date: Fri, 05 Sep 2025 17:17:45 +0200 Message-ID: <87ikhxhqsm.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: tcJRcU78oOt28YT_jEfRr5QbVOucKdnSfGYXcwAuqBQ_1757400418 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-11.7 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_H5, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, 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 <libabigail.sourceware.org> List-Unsubscribe: <https://sourceware.org/mailman/options/libabigail>, <mailto:libabigail-request@sourceware.org?subject=unsubscribe> List-Archive: <https://sourceware.org/pipermail/libabigail/> List-Post: <mailto:libabigail@sourceware.org> List-Help: <mailto:libabigail-request@sourceware.org?subject=help> List-Subscribe: <https://sourceware.org/mailman/listinfo/libabigail>, <mailto:libabigail-request@sourceware.org?subject=subscribe> Errors-To: libabigail-bounces~patchwork=sourceware.org@sourceware.org |
| Series |
[applied] dwarf-reader: Fix reader::merge_member_functions_of_classes
|
|
Commit Message
Dodji Seketeli
Sept. 5, 2025, 3:17 p.m. UTC
Hello,
While looking at something else, I figured
reader::merge_member_functions_of_classes would merge member functions
across class types of different names. Fixed thus.
* src/abg-dwarf-reader.cc
(reader::merge_member_functions_of_classes): Avoid merging member
functions across classes of different names.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to the master branch.
---
src/abg-dwarf-reader.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index baa9026c..e869355f 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -4904,7 +4904,8 @@ public: continue; n2 = klass->get_pretty_representation(true, true); - ABG_ASSERT(n1 == n2); + if (n1 != n2) + continue; copy_missing_member_functions(reference_class, klass); copy_missing_member_functions(klass, reference_class);