From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id E6038385801A for ; Sun, 1 Aug 2021 18:04:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E6038385801A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (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-out2.suse.de (Postfix) with ESMTPS id 1E5F11FEA9; Sun, 1 Aug 2021 18:04:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1627841044; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=gUoVLPJJ/3McYEf8NvRyXREBYXR+Fbm+AdO2SFmnjqI=; b=BDVVnP4Syn1Y8j51jczlZtFYMtdjcj92h8XcCwKc0c2LC23KDSXCylp+0awj3L5Ae2xS6s eBOPaVJwcF/L/oBjmgjTH8XO7KBvqb6eWYjHxD8+WYZOCvDxRGykQi1w0zta5LVhXZLi+Z zmlk/gJAwq1MMWB6PLNYDFo/FJIchqw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1627841044; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=gUoVLPJJ/3McYEf8NvRyXREBYXR+Fbm+AdO2SFmnjqI=; b=oPvI27eccopSq2yBsjY2CpJmku0nnniFj+Qis7UPQu+pf65X66oAFI81SGTw8hpaGRSUrN EjzD4fk+fTD3GvBw== Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (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 imap1.suse-dmz.suse.de (Postfix) with ESMTPS id F0412136B6; Sun, 1 Aug 2021 18:04:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap1.suse-dmz.suse.de with ESMTPSA id C2P5OBPiBmGbcwAAGKfGzw (envelope-from ); Sun, 01 Aug 2021 18:04:03 +0000 Date: Sun, 1 Aug 2021 20:04:02 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Cc: Simon Marchi , Tom Tromey Subject: [PATCH][gdb/symtab] Recognize .gdb_index symbol table with empty entries as empty Message-ID: <20210801180400.GA9164@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=-11.9 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Sun, 01 Aug 2021 18:04:06 -0000 Hi, When reading a .gdb_index that contains a non-empty symbol table with only empty entries, gdb doesn't recognize it as empty. Fix this by recognizing that the constant pool is empty, and then setting the symbol table to empty. Tested on x86_64-linux. Any comments? I don't see the need to propagate to gdb-11-branch, but perhaps I'm wrong there? Thanks, - Tom [gdb/symtab] Recognize .gdb_index symbol table with empty entries as empty gdb/ChangeLog: 2021-08-01 Tom de Vries PR symtab/28159 * dwarf2/read.c (read_gdb_index_from_buffer): Handle symbol table filled with empty entries. gdb/testsuite/ChangeLog: 2021-08-01 Tom de Vries PR symtab/28159 * gdb.dwarf2/dw2-zero-range.exp: Remove kfail. --- gdb/dwarf2/read.c | 7 +++++++ gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp | 22 ++-------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index de84c47b626..a937fbef1cc 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -2777,6 +2777,13 @@ to use the section anyway."), ++i; map->constant_pool = buffer.slice (metadata[i]); + if (map->constant_pool.empty () && !map->symbol_table.empty ()) + { + map->symbol_table + = offset_view (gdb::array_view (symbol_table, + symbol_table)); + } + return 1; } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp index 7b46c93d9b5..c3ae7537346 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-zero-range.exp @@ -148,16 +148,7 @@ foreach_with_prefix ranges_sect {ranges rnglists} { } } - if { $have_complaint } { - pass $test - } else { - set index [have_index $lib1] - if { $index == "gdb_index" } { - kfail symtab/28159 $test - } else { - fail $test - } - } + gdb_assert { $have_complaint } $test } if { ! $readnow_p } { @@ -173,16 +164,7 @@ foreach_with_prefix ranges_sect {ranges rnglists} { gdb_load $lib1 set test "Zero address complaint - unrelocated - psymtab" set have_complaint [regexp $re.* $gdb_file_cmd_msg] - if { $have_complaint } { - pass $test - } else { - set index [have_index $lib1] - if { $index == "gdb_index" } { - kfail symtab/28159 $test - } else { - fail $test - } - } + gdb_assert { $have_complaint } $test } if { ! $readnow_p } {