This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[commit TYPE_OPAQUE] [patch] PR symtab/13277: Resolving opaque structures in ICC generated binaries.
On Sun, 20 May 2012 15:17:19 +0200, Jan Kratochvil wrote:
> sorry I did not write a proper reproducer + testcase for it but I believe the
> attached patch should fix it. It is probably a regression since introduction
> of quick_symbol_functions.
Added a testcase. Added new method comment.
Checked in.
Thanks,
Jan
http://sourceware.org/ml/gdb-cvs/2012-05/msg00187.html
--- src/gdb/ChangeLog 2012/05/24 22:09:18 1.14293
+++ src/gdb/ChangeLog 2012/05/24 22:14:35 1.14294
@@ -1,3 +1,10 @@
+2012-05-24 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * psymtab.c (lookup_symbol_aux_psymtabs): New variable stab_best. Use
+ it as a fallback for TYPE_IS_OPAQUE.
+ * symfile.h (struct quick_symbol_functions): Mention TYPE_OPAQUE
+ symbols for lookup_symbol.
+
2012-05-24 John Steele Scott <toojays@toojays.net>
PR symtab/13277: Resolving opaque structures in ICC generated binaries.
--- src/gdb/testsuite/ChangeLog 2012/05/24 22:09:21 1.3206
+++ src/gdb/testsuite/ChangeLog 2012/05/24 22:14:35 1.3207
@@ -1,3 +1,8 @@
+2012-05-24 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * gdb.dwarf2/dw2-icc-opaque.S: Add debug_info_seg3 and
+ .debug_abbrev_seg3.
+
2012-05-24 John Steele Scott <toojays@toojays.net>
PR symtab/13277: Resolving opaque structures in ICC generated binaries.
--- src/gdb/psymtab.c 2012/05/18 14:26:26 1.46
+++ src/gdb/psymtab.c 2012/05/24 22:14:35 1.47
@@ -510,6 +510,7 @@
{
struct partial_symtab *ps;
const int psymtab_index = (block_index == GLOBAL_BLOCK ? 1 : 0);
+ struct symtab *stab_best = NULL;
ALL_OBJFILE_PSYMTABS_REQUIRED (objfile, ps)
{
@@ -530,13 +531,18 @@
}
if (sym && strcmp_iw (SYMBOL_SEARCH_NAME (sym), name) == 0)
- return stab;
+ {
+ if (!TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)))
+ return stab;
+
+ stab_best = stab;
+ }
/* Keep looking through other psymtabs. */
}
}
- return NULL;
+ return stab_best;
}
/* Look in PST for a symbol in DOMAIN whose name matches NAME. Search
--- src/gdb/symfile.h 2012/04/28 23:22:13 1.108
+++ src/gdb/symfile.h 2012/05/24 22:14:35 1.109
@@ -182,7 +182,9 @@
indicates what sort of symbol to search for.
Returns the newly-expanded symbol table in which the symbol is
- defined, or NULL if no such symbol table exists. */
+ defined, or NULL if no such symbol table exists. If OBJFILE
+ contains !TYPE_OPAQUE symbol prefer its symtab. If it contains
+ only TYPE_OPAQUE symbol(s), return at least that symtab. */
struct symtab *(*lookup_symbol) (struct objfile *objfile,
int kind, const char *name,
domain_enum domain);
--- src/gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.S 2012/05/24 22:09:21 1.1
+++ src/gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.S 2012/05/24 22:14:36 1.2
@@ -205,3 +205,54 @@
.byte 0x08 /* DW_FORM_string. */
.2byte 0x0000 /* End abbrev. */
.byte 0x00 /* End abbrev table. */
+
+
+ .file "opaque-pointer2.c"
+
+ .section .debug_info
+ .align 1
+debug_info_seg3:
+ .4byte debug_info_seg3_end - 1f /* Length of compilation unit info. */
+1:
+ .2byte 0x0002 /* DWARF version number. */
+ .4byte .debug_abbrev_seg3 /* Points to abbrev section for this unit. */
+ .byte 0x04 /* Target address size. */
+
+ .byte 0x01 /* DIE 1: DW_TAG_compile_unit. */
+ .byte 0x01 /* DW_AT_language = DW_LANG_C89. */
+ .ascii "Intel(R) C Intel(R) 64 Compiler XE " /* DW_AT_producer. */
+ .ascii "for applications running on Intel(R) 64, "
+ .ascii "Version 12.0.4.191 Build 20110427\n "
+ .asciz "Fixes SameLinkageName MemberPointers"
+
+ .byte 0x04 /* DIE 4: DW_TAG_structure_type. */
+ .byte 0x01 /* DW_AT_accessibility. */
+ .byte 0x00 /* DW_AT_byte_size. */
+ .asciz "opaque_struct_t" /* DW_AT_name. */
+
+ .byte 0x00 /* End DIE 1. */
+debug_info_seg3_end:
+
+ .section .debug_abbrev
+.debug_abbrev_seg3:
+ .align 1
+ .byte 0x01 /* Abbrev 1. */
+ .byte 0x11 /* DW_TAG_compile_unit. */
+ .byte 0x01 /* DW_CHILDREN_yes. */
+ .byte 0x13 /* DW_AT_language. */
+ .byte 0x0b /* DW_FORM_data1. */
+ .byte 0x25 /* DW_AT_producer. */
+ .byte 0x08 /* DW_AT_string. */
+ .2byte 0x0000 /* End abbrev. */
+
+ .byte 0x04 /* Abbrev 4. */
+ .byte 0x13 /* DW_TAG_structure_type. */
+ .byte 0x00 /* DW_CHILDREN_no. */
+ .byte 0x32 /* DW_AT_accessibility. */
+ .byte 0x0b /* DW_FORM_data1. */
+ .byte 0x0b /* DW_AT_byte_size. */
+ .byte 0x0b /* DW_FORM_data1. */
+ .byte 0x03 /* DW_AT_name. */
+ .byte 0x08 /* DW_FORM_string. */
+ .2byte 0x0000 /* End abbrev. */
+ .byte 0x00 /* End abbrev table. */