[gdb/symtab] Ignore DW_LNE_lo_user/DW_LNE_hi_user range

When reading an exec with a .debug_line section containing a vendor-specific
extended opcode, we get:
...
$ gdb -batch -iex "set complaints 10" dw2-vendor-extended-opcode
During symbol reading: mangled .debug_line section
...
and reading of the .debug_line section is abandoned.

The vendor-specific extended opcode should be ignored, as specified in the
DWARF standard (7.1 Vendor Extensibility).  [ FWIW, vendor-specific
standard opcodes are already ignored. ]

Fix this by ignoring all vendor-specific extended opcodes.

Build and tested on x86_64-linux.

gdb/ChangeLog:

2020-08-03  Tom de Vries  <tdevries@suse.de>

	PR symtab/26333
	* dwarf2/read.c (dwarf_decode_lines_1): Ignore
	DW_LNE_lo_user/DW_LNE_hi_user range.

gdb/testsuite/ChangeLog:

2020-08-03  Tom de Vries  <tdevries@suse.de>

	PR symtab/26333
	* lib/dwarf.exp (DW_LNE_user): New proc.
	* gdb.dwarf2/dw2-vendor-extended-opcode.c: New test.
	* gdb.dwarf2/dw2-vendor-extended-opcode.exp: New file.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9e718361a6140a13b48acf48afc1cb8cd7b4533b..276fa64df17498555d6405fbf9848d9c9709b265 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2020-08-03  Tom de Vries  <tdevries@suse.de>
+
+       PR symtab/26333
+       * dwarf2/read.c (dwarf_decode_lines_1): Ignore
+       DW_LNE_lo_user/DW_LNE_hi_user range.
+
 2020-07-30  Simon Marchi  <simon.marchi@polymtl.ca>
 
        PR ada/26318

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 4e70dccecbc62ce6c454e816dd7d09085da98a70..bcbffbf0e8b7c7a13a33d933dbffe83b6e93e6dd 100644 (file)
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -20591,6 +20591,13 @@ dwarf_decode_lines_1 (struct line_header *lh, struct dwarf2_cu *cu,
              extended_end = line_ptr + extended_len;
              extended_op = read_1_byte (abfd, line_ptr);
              line_ptr += 1;
+             if (DW_LNE_lo_user <= extended_op
+                 && extended_op <= DW_LNE_hi_user)
+               {
+                 /* Vendor extension, ignore.  */
+                 line_ptr = extended_end;
+                 break;
+               }
              switch (extended_op)
                {
                case DW_LNE_end_sequence:

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 29dc46aad79bd67cda612bf1448400ac4e1db2f7..1e1b702ec6d531cb723278bf65defc1e4bfc6e26 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2020-08-03  Tom de Vries  <tdevries@suse.de>
+
+       PR symtab/26333
+       * lib/dwarf.exp (DW_LNE_user): New proc.
+       * gdb.dwarf2/dw2-vendor-extended-opcode.c: New test.
+       * gdb.dwarf2/dw2-vendor-extended-opcode.exp: New file.
+
 2020-07-31  Kevin Buettner  <kevinb@redhat.com>
 
        * gdb.base/coremaker2.c: Change all uses of 'unsigned long long'

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.c b/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.c
new file mode 100644 (file)
index 0000000..97e019b
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.c
@@ -0,0 +1,32 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2020 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+void
+foo (void)
+{
+
+}
+
+int
+main()
+{
+  asm ("main_label: .globl main_label");
+  foo ();
+
+  asm ("main_label_2: .globl main_label_2");
+  return 0;
+}

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp b/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp
new file mode 100644 (file)
index 0000000..92db7ea
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp
@@ -0,0 +1,81 @@
+# Copyright 2020 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+load_lib dwarf.exp
+
+# This test can only be run on targets which support DWARF-2 and use gas.
+if {![dwarf2_support]} {
+    verbose "Skipping dw2-vendor-extended-opcode test."
+    return 0
+}
+
+# The .c files use __attribute__.
+if [get_compiler_info] {
+    return -1
+}
+if !$gcc_compiled {
+    verbose "Skipping dw2-vendor-extended-opcode test."
+    return 0
+}
+
+standard_testfile dw2-vendor-extended-opcode.c dw2-vendor-extended-opcode-dw.S
+
+set asm_file [standard_output_file $srcfile2]
+Dwarf::assemble $asm_file {
+    declare_labels Llines
+    global srcdir subdir srcfile
+
+    set DW_LNE_lo_usr 0x80
+    set DW_LNE_hi_usr 0xff
+
+    cu {} {
+       compile_unit {
+           {language @DW_LANG_C}
+           {name dw2-vendor-extended-opcode.c}
+           {stmt_list $Llines DW_FORM_sec_offset}
+       } {
+           subprogram {
+               {external 1 flag}
+               {MACRO_AT_func {main}}
+           }
+       }
+    }
+
+    lines {version 2} Llines {
+       include_dir "${srcdir}/${subdir}"
+       file_name "$srcfile" 1
+
+       program {
+           {DW_LNE_set_address main_label}
+           {line 27}
+           {DW_LNE_user 1 $DW_LNE_lo_usr}
+           {DW_LNE_user 2 $DW_LNE_hi_usr}
+           {DW_LNS_copy}
+
+           {DW_LNE_set_address main_label_2}
+           {DW_LNE_end_sequence}
+       }
+    }
+}
+
+if { [prepare_for_testing "failed to prepare" ${testfile} \
+         [list $srcfile $asm_file] {nodebug}] } {
+    return -1
+}
+
+if ![runto_main] {
+    return -1
+}
+
+gdb_breakpoint "$srcfile:27" message

diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp
index ee625c9f8c86e3417d4fc4465bc54aa82ee5ffa5..5c8406310523c8915e23397ad4c95565766fb731 100644 (file)
--- a/gdb/testsuite/lib/dwarf.exp
+++ b/gdb/testsuite/lib/dwarf.exp
@@ -1449,6 +1449,22 @@ namespace eval Dwarf {
                set _line 1
            }
 
+           proc DW_LNE_user { len opcode } {
+               set DW_LNE_lo_usr 0x80
+               set DW_LNE_hi_usr 0xff
+               if { $DW_LNE_lo_usr <= $opcode
+                    && $opcode <= $DW_LNE_hi_usr } {
+                   _op .byte 0
+                   _op .uleb128 $len
+                   _op .byte $opcode
+                   for {set i 1} {$i < $len} {incr i} {
+                       _op .byte 0
+                   }
+               } else {
+                   error "unknown vendor specific extended opcode: $opcode"
+               }
+           }
+
            proc DW_LNS_copy {} {
                _op .byte 1
            }