From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 59265 invoked by alias); 24 Jun 2019 16:27:18 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 59257 invoked by uid 89); 24 Jun 2019 16:27:18 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 spammy=HX-Languages-Length:1588 X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 24 Jun 2019 16:27:17 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 0DF35AE15; Mon, 24 Jun 2019 16:27:15 +0000 (UTC) Date: Mon, 24 Jun 2019 16:27:00 -0000 From: Tom de Vries To: gdb-patches@sourceware.org Cc: Jan Kratochvil Subject: [committed][gdb/testsuite] Fix label reference in implptr-64bit.exp Message-ID: <20190624162711.GA15802@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-IsSubscribed: yes X-SW-Source: 2019-06/txt/msg00534.txt.bz2 Hi, When running gdb.dwarf2/implptr-64bit.exp with board cc-with-dwz-m, we run into: ... dwz: dwz.c:2363: checksum_die: \ Assertion `\ ((!op_multifile && !rd_multifile && !fi_multifile) || cu != die_cu (ref)) \ && (!op_multifile || cu->cu_chunk == die_cu (ref)->cu_chunk)' failed. cc-with-tweaks.sh: line 218: 13030 Aborted \ $DWZ -m ${output_file}.dwz "$output_file" ${output_file}.alt > /dev/null ... In other words, PR dwz/24170. The trigger for the dwz PR is when intra-CU references are encoded using section-relative encoding DW_FORM_ref_addr, but could have been encoded using CU-relative encoding DW_FORM_ref4. Fix the intra-CU '%' label reference in implptr-64bit.exp. Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix label reference in implptr-64bit.exp gdb/testsuite/ChangeLog: 2019-06-24 Tom de Vries * gdb.dwarf2/implptr-64bit.exp: Fix intra-CU '%' label reference. --- gdb/testsuite/gdb.dwarf2/implptr-64bit.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp b/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp index b023ca0f12..3e675016d0 100644 --- a/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp +++ b/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp @@ -84,7 +84,7 @@ proc test { dwarf_version offset_size addr_size ref_addr_size two_cu } { { name main } { low_pc main addr } { high_pc "main+0x100" addr } - { type %$int_label } + { type :$int_label } { external 1 flag } } { DW_TAG_variable {