gdb/

	* dwarf2read.c
	(new_symbol <DW_TAG_variable> <!DW_AT_location> <DW_AT_external>):
	Create the symbol in local scope.
	* symtab.h (cu->list_in_scope <LOC_UNRESOLVED>): New comment part.

gdb/testsuite/
	* gdb.dwarf2/dw2-unresolved-main.c, gdb.dwarf2/dw2-unresolved.S,
	gdb.dwarf2/dw2-unresolved.exp: New.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cf4700f6bef7398dc71565d3d323e0f517d897e9..94373abfac01fb4793b178a0230bd3017bd297c4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * dwarf2read.c
+       (new_symbol <DW_TAG_variable> <!DW_AT_location> <DW_AT_external>):
+       Create the symbol in local scope.
+       * symtab.h (cu->list_in_scope <LOC_UNRESOLVED>): New comment part.
+
 2009-04-02  Keith Seitz  <keiths@redhat.com>
 
        * stabsread.c (read_member_functions): GCC may emit an extra space

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 9fd2f0c44a6721e96cc639c6b7d7b9eef7a11859..c3f38385882cc3977ff0eb1632a052807b346463 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -7682,7 +7682,7 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
                  && dwarf2_attr (die, DW_AT_type, cu) != NULL)
                {
                  SYMBOL_CLASS (sym) = LOC_UNRESOLVED;
-                 add_symbol_to_list (sym, &global_symbols);
+                 add_symbol_to_list (sym, cu->list_in_scope);
                }
              else if (!die_is_declaration (die, cu))
                {

diff --git a/gdb/symtab.h b/gdb/symtab.h
index 8b086f39fc5ef24f453448850df11f4cf4714429..f7689f6c04f9974e672dba9fb5a22414f6740324 100644 (file)
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -472,7 +472,13 @@ enum address_class
      in another object file or runtime common storage.
      The linker might even remove the minimal symbol if the global
      symbol is never referenced, in which case the symbol remains
-     unresolved.  */
+     unresolved.
+     
+     GDB would normally find the symbol in the minimal symbol table if it will
+     not find it in the full symbol table.  But a reference to an external
+     symbol in a local block shadowing other definition requires full symbol
+     without possibly having its address available for LOC_STATIC.  Testcase
+     is provided as `gdb.dwarf2/dw2-unresolved.exp'.  */
 
   LOC_UNRESOLVED,
 

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index afddd7cb3ef6002d8548238199c3a6f7cf313622..54d0c9a078956faa7d0f960ea9e42e875a26d0e5 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * gdb.dwarf2/dw2-unresolved-main.c, gdb.dwarf2/dw2-unresolved.S,
+       gdb.dwarf2/dw2-unresolved.exp: New.
+
 2009-04-02  Pedro Alves  <pedro@codesourcery.com>
 
        * gdb.mi/mi-nonstop-exit.exp: Don't check isnative.  Use

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unresolved-main.c b/gdb/testsuite/gdb.dwarf2/dw2-unresolved-main.c
new file mode 100644 (file)
index 0000000..c24eb96
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/dw2-unresolved-main.c
@@ -0,0 +1,46 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2009 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/>.  */
+
+#include <stdlib.h>
+
+asm (".globl cu_text_start");
+asm ("cu_text_start:");
+
+int
+main (void)
+{
+  unsigned char var = 1;
+
+  if (var != 1)
+    abort ();
+  {
+    extern unsigned char var;
+
+    /* Do not rely on the `extern' DIE output by GCC (GCC PR debug/39563).  */
+asm (".globl extern_block_start");
+asm ("extern_block_start:");
+    if (var != 2)
+      abort ();
+asm (".globl extern_block_end");
+asm ("extern_block_end:");
+  }
+
+  return 0;
+}
+
+asm (".globl cu_text_end");
+asm ("cu_text_end:");

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unresolved.S b/gdb/testsuite/gdb.dwarf2/dw2-unresolved.S
new file mode 100644 (file)
index 0000000..4c098f3
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/dw2-unresolved.S
@@ -0,0 +1,171 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2007, 2008, 2009 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/>.  */
+
+       .data
+
+/* VAR1 is wrong here, in the real inferior it is located on stack.  As both
+   places are never modified and they are initialized to the same value it
+   makes no difference.  Ensure the name clash for "var".  */
+var1:  .byte   1
+
+       .globl  var
+var:   .byte   2
+
+/* Debug information */
+
+       .section .debug_info
+.Lcu1_begin:
+       /* CU header */
+       .4byte  .Lcu1_end - .Lcu1_start         /* Length of Compilation Unit */
+.Lcu1_start:
+       .2byte  2                               /* DWARF Version */
+       .4byte  .Labbrev1_begin                 /* Offset into abbrev section */
+       .byte   4                               /* Pointer size */
+
+       /* CU die */
+       .uleb128 1                              /* Abbrev: DW_TAG_compile_unit */
+       .4byte  cu_text_end                     /* DW_AT_high_pc */
+       .4byte  cu_text_start                   /* DW_AT_low_pc */
+       .ascii  "dw2-unresolved-main.c\0"       /* DW_AT_name */
+       .ascii  "GNU C 4.3.2\0"                 /* DW_AT_producer */
+       .byte   1                               /* DW_AT_language (C) */
+
+.Ltype_uchar:
+       .uleb128        2                       /* Abbrev: DW_TAG_base_type */
+       .ascii          "unsigned char\0"       /* DW_AT_name */
+       .byte           1                       /* DW_AT_byte_size */
+       .byte           7                       /* DW_AT_encoding */
+
+       /* main */
+       .uleb128        3                       /* Abbrev: DW_TAG_subprogram */
+       .byte           1                       /* DW_AT_decl_file */
+       .byte           2                       /* DW_AT_decl_line */
+       .ascii          "main\0"                /* DW_AT_name */
+       .4byte          .Ltype_uchar-.Lcu1_begin        /* DW_AT_type */
+       .4byte          cu_text_start           /* DW_AT_low_pc */
+       .4byte          cu_text_end             /* DW_AT_high_pc */
+
+       .uleb128        4                       /* Abbrev: DW_TAG_variable (location) */
+       .ascii          "var\0"                 /* DW_AT_name */
+       .byte           2f - 1f                 /* DW_AT_location */
+1:     .byte           3                       /*   DW_OP_addr */
+/* See VAR1 definition why this DIE is not correct.  */
+       .4byte          var1                    /*   <addr> */
+2:     .4byte          .Ltype_uchar-.Lcu1_begin        /* DW_AT_type */
+
+       .uleb128        6                       /* Abbrev: DW_TAG_lexical_block */
+       .4byte          extern_block_start      /* DW_AT_low_pc */
+       .4byte          extern_block_end        /* DW_AT_high_pc */
+
+       .uleb128        5                       /* Abbrev: DW_TAG_variable (extern) */
+       .ascii          "var\0"                 /* DW_AT_name */
+       .4byte          .Ltype_uchar-.Lcu1_begin        /* DW_AT_type */
+       .byte           1                       /* DW_AT_external */
+
+       .byte           0                       /* End of children of the lexical block */
+
+       .byte           0                       /* End of children of main */
+
+       .byte           0                       /* End of children of CU */
+
+.Lcu1_end:
+
+/* Abbrev table */
+       .section .debug_abbrev
+.Labbrev1_begin:
+       .uleb128        1                       /* Abbrev code */
+       .uleb128        0x11                    /* DW_TAG_compile_unit */
+       .byte           1                       /* has_children */
+       .uleb128        0x12                    /* DW_AT_high_pc */
+       .uleb128        0x1                     /* DW_FORM_addr */
+       .uleb128        0x11                    /* DW_AT_low_pc */
+       .uleb128        0x1                     /* DW_FORM_addr */
+       .uleb128        0x3                     /* DW_AT_name */
+       .uleb128        0x8                     /* DW_FORM_string */
+       .uleb128        0x25                    /* DW_AT_producer */
+       .uleb128        0x8                     /* DW_FORM_string */
+       .uleb128        0x13                    /* DW_AT_language */
+       .uleb128        0xb                     /* DW_FORM_data1 */
+       .byte           0x0                     /* Terminator */
+       .byte           0x0                     /* Terminator */
+
+       .uleb128        2                       /* Abbrev code */
+       .uleb128        0x24                    /* DW_TAG_base_type */
+       .byte           0                       /* has_children */
+       .uleb128        0x3                     /* DW_AT_name */
+       .uleb128        0x8                     /* DW_FORM_string */
+       .uleb128        0xb                     /* DW_AT_byte_size */
+       .uleb128        0xb                     /* DW_FORM_data1 */
+       .uleb128        0x3e                    /* DW_AT_encoding */
+       .uleb128        0xb                     /* DW_FORM_data1 */
+       .byte           0x0                     /* Terminator */
+       .byte           0x0                     /* Terminator */
+
+       .uleb128        3                       /* Abbrev code */
+       .uleb128        0x2e                    /* DW_TAG_subprogram */
+       .byte           1                       /* has_children */
+       .uleb128        0x3a                    /* DW_AT_decl_file */
+       .uleb128        0xb                     /* DW_FORM_data1 */
+       .uleb128        0x3b                    /* DW_AT_decl_line */
+       .uleb128        0xb                     /* DW_FORM_data1 */
+       .uleb128        0x3                     /* DW_AT_name */
+       .uleb128        0x8                     /* DW_FORM_string */
+       .uleb128        0x49                    /* DW_AT_type */
+       .uleb128        0x13                    /* DW_FORM_ref4 */
+       .uleb128        0x11                    /* DW_AT_low_pc */
+       .uleb128        0x1                     /* DW_FORM_addr */
+       .uleb128        0x12                    /* DW_AT_high_pc */
+       .uleb128        0x1                     /* DW_FORM_addr */
+       .byte           0x0                     /* Terminator */
+       .byte           0x0                     /* Terminator */
+
+       .uleb128        4                       /* Abbrev code (location) */
+       .uleb128        0x34                    /* DW_TAG_variable */
+       .byte           0                       /* has_children */
+       .uleb128        0x3                     /* DW_AT_name */
+       .uleb128        0x8                     /* DW_FORM_string */
+       .uleb128        0x2                     /* DW_AT_location */
+       .uleb128        0xa                     /* DW_FORM_block1 */
+       .uleb128        0x49                    /* DW_AT_type */
+       .uleb128        0x13                    /* DW_FORM_ref4 */
+       .byte           0x0                     /* Terminator */
+       .byte           0x0                     /* Terminator */
+
+       .uleb128        5                       /* Abbrev code (extern) */
+       .uleb128        0x34                    /* DW_TAG_variable */
+       .byte           0                       /* has_children */
+       .uleb128        0x3                     /* DW_AT_name */
+       .uleb128        0x8                     /* DW_FORM_string */
+       .uleb128        0x49                    /* DW_AT_type */
+       .uleb128        0x13                    /* DW_FORM_ref4 */
+       .uleb128        0x3f                    /* DW_AT_external */
+       .uleb128        0xc                     /* DW_FORM_flag */
+       .byte           0x0                     /* Terminator */
+       .byte           0x0                     /* Terminator */
+
+       .uleb128        6                       /* Abbrev code */
+       .uleb128        0x0b                    /* DW_TAG_lexical_block */
+       .byte           1                       /* has_children */
+       .uleb128        0x11                    /* DW_AT_low_pc */
+       .uleb128        0x1                     /* DW_FORM_addr */
+       .uleb128        0x12                    /* DW_AT_high_pc */
+       .uleb128        0x1                     /* DW_FORM_addr */
+       .byte           0x0                     /* Terminator */
+       .byte           0x0                     /* Terminator */
+
+       .byte           0x0                     /* Terminator */
+       .byte           0x0                     /* Terminator */

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp b/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp
new file mode 100644 (file)
index 0000000..70eebec
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp
@@ -0,0 +1,41 @@
+# Copyright 2009 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/>.
+
+# This test can only be run on targets which support DWARF-2 and use gas.
+# For now pick a sampling of likely targets.
+if {![istarget *-*-linux*]
+    && ![istarget *-*-gnu*]
+    && ![istarget *-*-elf*]
+    && ![istarget *-*-openbsd*]
+    && ![istarget arm-*-eabi*]
+    && ![istarget powerpc-*-eabi*]} {
+    return 0  
+}
+
+if { [prepare_for_testing dw2-unresolved.exp "dw2-unresolved" {dw2-unresolved-main.c dw2-unresolved.S} {nodebug}] } {
+    return -1
+}
+
+if ![runto_main] {
+    return -1
+}
+
+# This testcase tests LOC_UNRESOLVED works right.
+
+gdb_breakpoint "*extern_block_start"
+gdb_continue_to_breakpoint "*extern_block_start"
+
+# Expect the inner value 2.  Value 1 from the outer local block is shadowed.
+gdb_test "print/d var" "= 2"