This is the mail archive of the
elfutils-devel@sourceware.org
mailing list for the elfutils project.
[PATCH] libdw: Handle FORM_GNU_strp_alt for files with string data only in dwz file.
- From: Mark Wielaard <mjw at redhat dot com>
- To: elfutils-devel at lists dot fedorahosted dot org
- Date: Fri, 15 Feb 2013 22:53:58 +0100
- Subject: [PATCH] libdw: Handle FORM_GNU_strp_alt for files with string data only in dwz file.
dwarf_formstring should check that the dbg file from which we want the
strp data actually has a IDX_debug_str section.
Reported-By: Tom Tromey <tromey@redhat.com>
Signed-off-by: Mark Wielaard <mjw@redhat.com>
---
libdw/ChangeLog | 5 +++
libdw/dwarf_formstring.c | 4 +--
tests/ChangeLog | 8 +++++
tests/Makefile.am | 1 +
tests/run-readelf-dwz-multi.sh | 73 +++++++++++++++++++++++++++++++++++++++-
tests/testfile-dwzstr.bz2 | Bin 0 -> 2768 bytes
tests/testfile-dwzstr.multi.bz2 | Bin 0 -> 518 bytes
7 files changed, 88 insertions(+), 3 deletions(-)
create mode 100755 tests/testfile-dwzstr.bz2
create mode 100644 tests/testfile-dwzstr.multi.bz2
diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 3cf3032..2900ef6 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-15 Mark Wielaard <mjw@redhat.com>
+
+ * dwarf_formstring.c (dwarf_formstring): Check dbg_ret->sectiondata,
+ not dbg->sectiondata.
+
2013-01-07 Roland McGrath <roland@hack.frob.com>
* memory-access.h
diff --git a/libdw/dwarf_formstring.c b/libdw/dwarf_formstring.c
index c66454e..02b56d4 100644
--- a/libdw/dwarf_formstring.c
+++ b/libdw/dwarf_formstring.c
@@ -1,5 +1,5 @@
/* Return string associated with given attribute.
- Copyright (C) 2003-2010 Red Hat, Inc.
+ Copyright (C) 2003-2010, 2013 Red Hat, Inc.
This file is part of elfutils.
Written by Ulrich Drepper <drepper@redhat.com>, 2003.
@@ -60,7 +60,7 @@ dwarf_formstring (attrp)
if (unlikely (attrp->form != DW_FORM_strp
&& attrp->form != DW_FORM_GNU_strp_alt)
- || dbg->sectiondata[IDX_debug_str] == NULL)
+ || dbg_ret->sectiondata[IDX_debug_str] == NULL)
{
__libdw_seterrno (DWARF_E_NO_STRING);
return NULL;
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 0a26e7e..c1e0ef9 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-15 Mark Wielaard <mjw@redhat.com>
+
+ * testfile-dwzstr.bz2: New testfile.
+ * testfile-dwzstr.multi.bz2: Likewise.
+ * run-readelf-dwz-multi.sh: Add readelf testfile-dwzstr test.
+ * Makefile.am (EXTRA_DIST): Add testfile-dwzstr.bz2 and
+ testfile-dwzstr.multi.bz2.
+
2013-01-30 Mark Wielaard <mjw@redhat.com>
* testfileloc.bz2: New testfile.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a26e5c2..44b4e61 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -154,6 +154,7 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh \
run-readelf-loc.sh testfileloc.bz2 \
run-readelf-dwz-multi.sh libtestfile_multi_shared.so.bz2 \
testfile_multi.dwz.bz2 testfile_multi_main.bz2 \
+ testfile-dwzstr.bz2 testfile-dwzstr.multi.bz2 \
run-prelink-addr-test.sh \
testfile52-32.so.bz2 testfile52-32.so.debug.bz2 \
testfile52-32.prelink.so.bz2 testfile52-32.noshdrs.so.bz2 \
diff --git a/tests/run-readelf-dwz-multi.sh b/tests/run-readelf-dwz-multi.sh
index aadbbbe..20c00c5 100755
--- a/tests/run-readelf-dwz-multi.sh
+++ b/tests/run-readelf-dwz-multi.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2012 Red Hat, Inc.
+# Copyright (C) 2012, 2013 Red Hat, Inc.
# This file is part of elfutils.
#
# This file is free software; you can redistribute it and/or modify
@@ -56,7 +56,27 @@
# gcc -g -o testfile_multi_main -L. -ltestfile_multi_shared main.c -Wl,-rpath,.
# dwz -m testfile_multi.dwz testfile_multi_main libtestfile_multi_shared.so
+# main.c
+#
+# struct foobarbaz
+# {
+# int counter;
+# char *bookstore;
+# };
+#
+# int
+# main (int argc, char **argv)
+# {
+# struct foobarbaz fbb;
+# return 0;
+# }
+
+# gcc -g -o testfile-dwzstr main.c
+# cp testfile-dwzstr testfile-dwzstr.alt
+# dwz -m testfile-dwzstr.multi testfile-dwzstr testfile-dwzstr.alt
+
testfiles libtestfile_multi_shared.so testfile_multi_main testfile_multi.dwz
+testfiles testfile-dwzstr testfile-dwzstr.multi
testrun_compare ../src/readelf --debug-dump=info testfile_multi_main <<\EOF
@@ -153,4 +173,55 @@ DWARF section [25] '.debug_info' at offset 0x106c:
[ 0] fbreg -24
EOF
+testrun_compare ../src/readelf --debug-dump=info testfile-dwzstr <<\EOF
+
+DWARF section [28] '.debug_info' at offset 0x1088:
+ [Offset]
+ Compilation unit at offset 0:
+ Version: 4, Abbreviation section offset: 0, Address size: 8, Offset size: 4
+ [ b] compile_unit
+ producer (GNU_strp_alt) "GNU C 4.7.2 20121109 (Red Hat 4.7.2-8) -mtune=generic -march=x86-64 -g"
+ language (data1) C89 (1)
+ name (GNU_strp_alt) "main.c"
+ comp_dir (GNU_strp_alt) "/home/mark/src/tests"
+ low_pc (addr) 0x00000000004004ec <main>
+ high_pc (udata) 18
+ stmt_list (sec_offset) 0
+ [ 26] imported_unit
+ import (GNU_ref_alt) [ b]
+ [ 2b] subprogram
+ external (flag_present)
+ name (GNU_strp_alt) "main"
+ decl_file (data1) 1
+ decl_line (data1) 8
+ prototyped (flag_present)
+ type (GNU_ref_alt) [ 30]
+ low_pc (addr) 0x00000000004004ec <main>
+ high_pc (udata) 18
+ frame_base (exprloc)
+ [ 0] call_frame_cfa
+ GNU_all_call_sites (flag_present)
+ [ 41] formal_parameter
+ name (GNU_strp_alt) "argc"
+ decl_file (data1) 1
+ decl_line (data1) 8
+ type (GNU_ref_alt) [ 30]
+ location (exprloc)
+ [ 0] fbreg -36
+ [ 4f] formal_parameter
+ name (GNU_strp_alt) "argv"
+ decl_file (data1) 1
+ decl_line (data1) 8
+ type (GNU_ref_alt) [ 41]
+ location (exprloc)
+ [ 0] fbreg -48
+ [ 5d] variable
+ name (string) "fbb"
+ decl_file (data1) 1
+ decl_line (data1) 10
+ type (GNU_ref_alt) [ 14]
+ location (exprloc)
+ [ 0] fbreg -32
+EOF
+
exit 0
diff --git a/tests/testfile-dwzstr.bz2 b/tests/testfile-dwzstr.bz2
new file mode 100755
index 0000000000000000000000000000000000000000..8d2d326e0b0f5cd84b91097b51a17084c7162f82
GIT binary patch
literal 2768
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
W3U>F~jV8^1i(a)744C`fkcp8J4TR{XR8
literal 0
HcmV?d00001
diff --git a/tests/testfile-dwzstr.multi.bz2 b/tests/testfile-dwzstr.multi.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..5e84991d42ec673a87a2caf4ce39cc8847c3e3fc
GIT binary patch
literal 518
zcmV+h0{Q(yT4*^jL0KkKS>m>W+yDVhfA|02?uu38_y23<k_Er-pHz?_C;<>4004jx
z0sue&FaeAs5Y;@URPv4JQ!<CBJwwuZgF{U{Ks_cv2A+|S2dH^Xs5LYu6*kdNQRr%D
z!ejxaO#>igGH3t+p^2cxkv$|Hp!EYyJt3ge(EtWO05kv(a)00xefrD|jAp#%4hNH15}
zZIB&o!1=AQYTraHK*00XF;i5<;sbdKXb?UmrxX?N7z0%kQ4q>|n1XlE4(a)SZydR1U%
zm5i~m%tYgg%mJAS7VY}?R>pJgRESQ{w5>klDlW<K(GtV-;2{D92C9+6UtxqRokaE&
z7fL<o2vAV42^Lh4btdRlEHI4;$X?~ShE18S-bI|?!em4dgbb2xk#ST3b(T>P74U1;
z!+uz#mPq2WI+b5aj_%j=Je)#^X@^JUp!ixcx<@u@??BcNRxk$<RKu>|vlAh!skWvu
z>=52%@1sDtaONVeT>i$uLPWBI^!F6C_s`fsZcR83B-{lu`CpZ9Uqcl*!k(a)_qe^?e7
zn3iE%3(a)Zla#E48Vt>luP#F#1T>sT;ju955vUI<#|8hmBMqR){dEN^8#qoqa?vyTZP
zYt)?4NfakZEbfd;CamEkr3hl#jm&+pK8836=ztl(a)Y(*rjZqWWHA#j_;O8?^SNT&)C
I99Ga<fS^U`Z2$lO
literal 0
HcmV?d00001
--
1.8.1.2