From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 8472A3858D1E for ; Tue, 13 Sep 2022 14:48:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8472A3858D1E Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B69B534BB8; Tue, 13 Sep 2022 14:48:03 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9EFB813AB5; Tue, 13 Sep 2022 14:48:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Ara6JSOYIGNeQwAAMHmgww (envelope-from ); Tue, 13 Sep 2022 14:48:03 +0000 Date: Tue, 13 Sep 2022 16:48:02 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH][gdb/testsuite] Fix gdb.dwarf2/dw2-dir-file-name.exp for aarch64 Message-ID: <20220913144800.GA27877@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Sep 2022 14:48:06 -0000 Hi, [ Another attempt at fixing the problem described in commit cd919f5533c ("[gdb/testsuite] Fix gdb.dwarf2/dw2-dir-file-name.exp"). ] When running the test-case gdb.dwarf2/dw2-dir-file-name.exp with aarch64-linux, we run into: ... (gdb) continue^M Continuing.^M ^M Breakpoint 2, compdir_missing__ldir_missing__file_basename () at \ tmp-dw2-dir-file-name.c:999^M (gdb) FAIL: gdb.dwarf2/dw2-dir-file-name.exp: \ compdir_missing__ldir_missing__file_basename: continue to breakpoint: \ compdir_missing__ldir_missing__file_basename ... The breakpoint set at compdir_missing__ldir_missing__file_basename_label, address 0x400608 starts at a line entry: ... CU: tmp-dw2-dir-file-name.c: File name Line number Starting address View Stmt tmp-dw2-dir-file-name.c 999 0x400608 x tmp-dw2-dir-file-name.c 1000 0x40062c x tmp-dw2-dir-file-name.c - 0x40062c ... and therefore the breakpoint is printed without instruction address. In contrast, for x86_64-linux, we have the breakpoint printed with instruction address: ... (gdb) continue^M Continuing.^M ^M Breakpoint 2, 0x004004c1 in compdir_missing__ldir_missing__file_basename () \ at tmp-dw2-dir-file-name.c:999^M (gdb) PASS: gdb.dwarf2/dw2-dir-file-name.exp: \ compdir_missing__ldir_missing__file_basename: continue to breakpoint: \ compdir_missing__ldir_missing__file_basename ... The breakpoint set at compdir_missing__ldir_missing__file_basename_label, address 0x004004c1 doesn't start at a line entry: ... CU: tmp-dw2-dir-file-name.c: File name Line number Starting address View Stmt tmp-dw2-dir-file-name.c 999 0x4004bd x tmp-dw2-dir-file-name.c 1000 0x4004d3 x tmp-dw2-dir-file-name.c - 0x4004d3 ... Fix this by: - unifying behaviour between the archs by adding an explicit line number entry for the address compdir_missing__ldir_missing__file_basename_label, making the FAIL reproducible on x86_64-linux. - expecting the breakpoint to be printed without instruction address. Tested on x86_64-linux and aarch64-linux. Any comments? Thanks, - Tom [gdb/testsuite] Fix gdb.dwarf2/dw2-dir-file-name.exp for aarch64 --- gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp index 053f7229537..3827ed744b5 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp @@ -188,13 +188,20 @@ proc out_line { name cu_dir cu_name line_dir line_name } { .Lline_${name}_lines: .byte 3 /* DW_LNS_advance_line */ - .sleb128 998 /* ... to 999 */ + .sleb128 997 /* ... to 998 */ .byte 0 /* DW_LNE_set_address */ .uleb128 ${addr_len}+1 .byte 2 .${addr_len}byte $name_start .byte 1 /* DW_LNS_copy */ .byte 3 /* DW_LNS_advance_line */ + .sleb128 1 /* ... to 999 */ + .byte 0 /* DW_LNE_set_address */ + .uleb128 ${addr_len}+1 + .byte 2 + .${addr_len}byte ${name}_label + .byte 1 /* DW_LNS_copy */ + .byte 3 /* DW_LNS_advance_line */ .sleb128 1 /* ... to 1000 */ .byte 0 /* DW_LNE_set_address */ .uleb128 ${addr_len}+1 @@ -451,19 +458,19 @@ proc test { func compdir filename } { } gdb_breakpoint ${func}_label - gdb_continue_to_breakpoint $func "$func \\(\\) at .*" + gdb_test "continue" "$func \\(\\) at .*" "continue to $func" gdb_test_no_output "set filename-display absolute" verbose -log "expect: ${absolute}" - gdb_test "frame" " in $func \\(\\) at [string_to_regexp ${absolute}]:999" "absolute" + gdb_test "frame" "$func \\(\\) at [string_to_regexp ${absolute}]:999" "absolute" gdb_test_no_output "set filename-display basename" verbose -log "expect: [file tail $filename]" - gdb_test "frame" " in $func \\(\\) at [string_to_regexp [file tail $filename]]:999" "basename" + gdb_test "frame" "$func \\(\\) at [string_to_regexp [file tail $filename]]:999" "basename" gdb_test_no_output "set filename-display relative" verbose -log "expect: $filename" - gdb_test "frame" " in $func \\(\\) at [string_to_regexp $filename]:999" "relative" + gdb_test "frame" "$func \\(\\) at [string_to_regexp $filename]:999" "relative" } }