[binutils-gdb] [gdb/testsuite] Fix label reference in implptr-64bit.exp

[binutils-gdb] [gdb/testsuite] Fix label reference in implptr-64bit.exp

[Tom de Vries]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=164e3873cf41d01a9a67396575dceef7489cee64

commit 164e3873cf41d01a9a67396575dceef7489cee64
Author: Tom de Vries <tdevries@suse.de>
Date:   Mon Jun 24 18:26:10 2019 +0200

    [gdb/testsuite] Fix label reference in implptr-64bit.exp
    
    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.
    
    gdb/testsuite/ChangeLog:
    
    2019-06-24  Tom de Vries  <tdevries@suse.de>
    
    	* gdb.dwarf2/implptr-64bit.exp: Fix intra-CU '%' label reference.

Diff:
---
 gdb/testsuite/ChangeLog                    | 4 ++++
 gdb/testsuite/gdb.dwarf2/implptr-64bit.exp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a8e4755..5b70201 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2019-06-24  Tom de Vries  <tdevries@suse.de>
 
+	* gdb.dwarf2/implptr-64bit.exp: Fix intra-CU '%' label reference.
+
+2019-06-24  Tom de Vries  <tdevries@suse.de>
+
 	* gdb.trace/entry-values.exp: Use DW_FORM_udata instead of
 	DW_FOR_sdata for DW_AT_decl_file.  Use 0 for DW_AT_decl_file.
 	* gdb.trace/unavailable-dwarf-piece.exp: Same.
diff --git a/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp b/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp
index b023ca0..3e67501 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 {