From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::226]) by sourceware.org (Postfix) with ESMTPS id D50C6384A056 for ; Tue, 16 Jul 2024 14:55:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D50C6384A056 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=seketeli.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D50C6384A056 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:4b98:dc4:8::226 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721141749; cv=none; b=Mdn1RCXlypIa2WSsNJZ7zt8JGj3rAzw9w+Ih5Ro0IOj5IKPE0+dg01TlFMRPOgvWGnI+aWDmzlSY6VGWj5dsz6LxESlYmzwbZ9UssfQyjpv3a3/WSBEgRob+OoWP22UOrVqp808YoalilRBemHPcaflVqEPvm9WFeoMgw9Ol4Wg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1721141749; c=relaxed/simple; bh=nw9ZqHNpCMoP1I8wMIRk6sdEzu5dczULyhdxQqSlB6o=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=eaFVKnbdguV6KE+CoXHpanbRPK9WM1uvxHe79lM/g5NenMfLtqnr49vV1LsQUxrdDFjnXwlhF3IsQAfQmN0REwDpMYzmCw3nKztAIR5c5rv4mKdB2Ihx+I5JCgndz9ctdfrNO/CKIfuYwrbUjVxGruXWgNdn58/Y01PG8uTzdVI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail.gandi.net (Postfix) with ESMTPSA id DB210C0008; Tue, 16 Jul 2024 14:55:42 +0000 (UTC) Received: by localhost (Postfix, from userid 1000) id 3C2D7C1B792C; Tue, 16 Jul 2024 16:55:41 +0200 (CEST) From: dodji@redhat.com To: libabigail@sourceware.org Cc: dodji@redhat.com Subject: [PATCH 05/17] ctf-reader: Do not set data member offsets for unions Date: Tue, 16 Jul 2024 16:55:16 +0200 Message-ID: <20240716145541.473065-6-dodji@redhat.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20240716145541.473065-1-dodji@redhat.com> References: <20240716145541.473065-1-dodji@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-GND-Sasl: dodj@seketeli.org X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS,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 List-Id: From: Dodji Seketeli All union data members should have an offset set to 0. It turns out the CTF reader unnecessarily sets the data member offset. This patch fixes that. * src/abg-ctf-reader.cc (process_ctf_sou_members): Do not set any union data member offset. Signed-off-by: Dodji Seketeli --- src/abg-ctf-reader.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/abg-ctf-reader.cc b/src/abg-ctf-reader.cc index 4b6c6cd8..3dc09b29 100644 --- a/src/abg-ctf-reader.cc +++ b/src/abg-ctf-reader.cc @@ -1087,7 +1087,7 @@ process_ctf_sou_members(reader *rdr, public_access, true /* is_laid_out */, false /* is_static */, - membinfo.ctm_offset); + is_union_type(sou) ? 0 : membinfo.ctm_offset); } if (ctf_errno(ctf_dictionary) != ECTF_NEXT_END) fprintf(stderr, "ERROR from ctf_member_next\n"); -- 2.43.5