This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [PATCH] Fix gdb crash when setting breakpoint in assembler file compiled by ARM tool chain
- From: Tom Tromey <tromey at redhat dot com>
- To: Andreas Kaufmann <Andreas dot Kaufmann at synopsys dot com>
- Cc: "gdb-patches\ at sourceware dot org" <gdb-patches at sourceware dot org>, Kai Schuetz <Kai dot Schuetz at synopsys dot com>
- Date: Thu, 25 Apr 2013 10:18:04 -0600
- Subject: Re: [PATCH] Fix gdb crash when setting breakpoint in assembler file compiled by ARM tool chain
- References: <5570CCEF7886EE48BAAD632645A58FDA1281B4AC at DE02WEMBXB dot internal dot synopsys dot com>
>>>>> "Andreas" == Andreas Kaufmann <Andreas.Kaufmann@synopsys.com> writes:
Andreas> Here is a patch to fix gdb crash when setting breakpoint in
Andreas> assembler file compiled by ARM tool chain. The detailed problem
Andreas> description and a test case (including elf-file) can be found
Andreas> here: http://sourceware.org/bugzilla/show_bug.cgi?id=15343
Thanks.
This patch is ok.
In the future please write a ChangeLog entry for the patch.
Also in this case, a test case would have been nice.
I wrote one which I'm also checking in.
I've appended the full patch.
Built and regtested on x86-64 Fedora 18.
Tom
2013-04-25 Andreas Kaufmann <Andreas.Kaufmann@synopsys.com>
PR corefiles/14983:
* dwarf2read.c (process_full_comp_unit): Always create a static
block.
2013-04-25 Tom Tromey <tromey@redhat.com>
* gdb.dwarf2/nostaticblock.exp: New file.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 3c9972b..37b7dc4 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -7132,8 +7132,7 @@ process_full_comp_unit (struct dwarf2_per_cu_data *per_cu,
get_scope_pc_bounds (cu->dies, &lowpc, &highpc, cu);
static_block
- = end_symtab_get_static_block (highpc + baseaddr, objfile, 0,
- per_cu->imported_symtabs != NULL);
+ = end_symtab_get_static_block (highpc + baseaddr, objfile, 0, 1);
/* If the comp unit has DW_AT_ranges, it may have discontiguous ranges.
Also, DW_AT_ranges may record ranges not belonging to any child DIEs
diff --git a/gdb/testsuite/gdb.dwarf2/nostaticblock.exp b/gdb/testsuite/gdb.dwarf2/nostaticblock.exp
new file mode 100644
index 0000000..69e4c60
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/nostaticblock.exp
@@ -0,0 +1,59 @@
+# Copyright 2013 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]} {
+ return 0
+}
+
+if { [skip_cplus_tests] } { continue }
+
+standard_testfile main.c .S
+
+# Make some DWARF for the test.
+set asm_file [standard_output_file $srcfile2]
+Dwarf::assemble $asm_file {
+ cu 0 2 8 {
+ compile_unit {
+ {low_pc 0x104320 DW_FORM_addr}
+ {high_pc 0x1045ed DW_FORM_addr}
+ } {
+ }
+ }
+}
+
+if {[gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile}1.o \
+ object {nodebug}] != ""} {
+ return -1
+}
+
+if {[gdb_compile $asm_file ${binfile}2.o object {nodebug}] != ""} {
+ return -1
+}
+
+if {[gdb_compile [list ${binfile}1.o ${binfile}2.o] \
+ "${binfile}" executable {c++}] != ""} {
+ return -1
+}
+
+clean_restart ${testfile}
+
+set saved_gdbflags $GDBFLAGS
+set GDBFLAGS "$GDBFLAGS --readnow"
+clean_restart $testfile
+set GDBFLAGS $saved_gdbflags
+
+gdb_test "p 1" " = 1" "alive"