From patchwork Thu May 16 09:45:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 90270 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 ED4C03849AE3 for ; Thu, 16 May 2024 09:44:33 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 85A573858414 for ; Thu, 16 May 2024 09:44:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 85A573858414 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 85A573858414 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715852646; cv=none; b=DMTMxJs9e4GDs3ofLniAk59A0wYcubv/IcoCM3VjO1ASpM0nvKcwZjydfw4TUmhJwDIygD2xk87oYDRfCg0AvyyAVwQr9ANtSjzFy7eGdA2hF61g/d4BbzYblffdtyGbdZHz1rhf/3atL5BbvGt6flm0FstYcD2GRowkXUXpvwY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715852646; c=relaxed/simple; bh=eHGuDBAk+j1aSPtzVxy/gmhWke9TPPcLswVLYO7Vmt0=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=gwWYTuz3LYNIy/FX986qdgE9w2oXdJNVGVAuI6iaQJ5DxjlMkkmO4yc7l5ISPWV61h+IjIFB/FgqXQb3jRMDDItFuQMizJb0Imlr05jXc9gY/vnb0eGK8+cknVYXd4RfqQ+BsCWVY5drAYC//g/KvbxRG4MMeYmyYGdUlfi8Vzo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 7D82E5C0A0 for ; Thu, 16 May 2024 09:44:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715852642; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZDRdx+UhlbIt6/20otZ7ijdySNDGLCDQ8ow1LcwBEDk=; b=eYZu2MhceRRItNsRFOZW5EllVmBLXZYcIpiUUbVKxZCJT8eqQFk4mOfaA4aZdD+Cowcqva dSYeF03uLbxEcmwIRLffKsWycBRl2j7HvJQilvS4r6laZuVCP5zX64ET4O8xMPfW/hDnkp x59CyPECXuju6ecdka1M7PQ0mKAjJbE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715852642; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZDRdx+UhlbIt6/20otZ7ijdySNDGLCDQ8ow1LcwBEDk=; b=C8ewUC7CTpfRvWFudbp4HkGvAN68h7f5j6YOFaIxtMsmR6LHqkp+jLBwn+p5OnDV4Sw5Zn ZuLSh097OjQ9eeDw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715852642; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZDRdx+UhlbIt6/20otZ7ijdySNDGLCDQ8ow1LcwBEDk=; b=eYZu2MhceRRItNsRFOZW5EllVmBLXZYcIpiUUbVKxZCJT8eqQFk4mOfaA4aZdD+Cowcqva dSYeF03uLbxEcmwIRLffKsWycBRl2j7HvJQilvS4r6laZuVCP5zX64ET4O8xMPfW/hDnkp x59CyPECXuju6ecdka1M7PQ0mKAjJbE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715852642; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZDRdx+UhlbIt6/20otZ7ijdySNDGLCDQ8ow1LcwBEDk=; b=C8ewUC7CTpfRvWFudbp4HkGvAN68h7f5j6YOFaIxtMsmR6LHqkp+jLBwn+p5OnDV4Sw5Zn ZuLSh097OjQ9eeDw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 6402E13991 for ; Thu, 16 May 2024 09:44:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id CwzlFmLVRWbSRgAAD6G6ig (envelope-from ) for ; Thu, 16 May 2024 09:44:02 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/testsuite] Add missing terminator in Dwarf::_macro_unit Date: Thu, 16 May 2024 11:45:01 +0200 Message-Id: <20240516094501.7782-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Score: -2.58 X-Spam-Level: X-Spamd-Result: default: False [-2.58 / 50.00]; BAYES_HAM(-2.78)[99.05%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org When printing complaints with one of the execs from test-case gdb.dwarf2/macro-source-path.exp, we run into: ... $ gdb -q -batch \ -iex "set complaints 100" \ macro-source-path-clang14-dw4-absolute-cwd-32 \ -ex "p main" During symbol reading: debug info runs off end of .debug_macro section \ [in module macro-source-path-clang14-dw4-absolute-cwd-32] $1 = {int ()} 0x4004b7
... and readelf complains more specifically: ... Contents of the .debug_macro section: Offset: 0 Version: 5 Offset size: 4 Offset into .debug_line: 0xe3 DW_MACRO_define - lineno : 0 macro : ONE 1 DW_MACRO_define_strp - lineno : 0 macro : THREE 3 DW_MACRO_start_file - lineno: 0 filenum: 1 filename: test.c DW_MACRO_define - lineno : 1 macro : TWO 2 DW_MACRO_end_file readelf: Error: .debug_macro section not zero terminated ... Fix this by adding the missing terminator in Dwarf::_macro_unit. Tested on x86_64-linux. --- gdb/testsuite/gdb.dwarf2/macro-source-path.exp | 11 +++++++++++ gdb/testsuite/lib/dwarf.exp | 2 ++ 2 files changed, 13 insertions(+) base-commit: 9c54f520db35bea9d02d121d4f368a5d196c5a8c diff --git a/gdb/testsuite/gdb.dwarf2/macro-source-path.exp b/gdb/testsuite/gdb.dwarf2/macro-source-path.exp index b6b7b0bd2fd..fccfabdebb1 100644 --- a/gdb/testsuite/gdb.dwarf2/macro-source-path.exp +++ b/gdb/testsuite/gdb.dwarf2/macro-source-path.exp @@ -139,6 +139,17 @@ proc do_test { test_name lines_version DW_AT_name main_file_idx directories return } + with_complaints 5 { + gdb_test_multiple "print main" "no complaints" { + -wrap -re "During symbol reading: .*" { + fail $gdb_test_name + } + -wrap -re "" { + pass $gdb_test_name + } + } + } + if ![runto_main] { return } diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp index 5b23a60af8e..995cdcac941 100644 --- a/gdb/testsuite/lib/dwarf.exp +++ b/gdb/testsuite/lib/dwarf.exp @@ -2252,6 +2252,8 @@ namespace eval Dwarf { with_override Dwarf::end_file Dwarf::_macro_unit_end_file { uplevel $body }}}} + + _op .byte 0x0 "# End macro unit" } # Emit a DW_MACRO_define entry.