diff options
author | Tom Tromey <tromey@redhat.com> | 2010-03-13 00:27:12 +0000 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2010-03-13 00:27:12 +0000 |
commit | 1c809c688364f87ba62a4c590b53d1efe0cff64e (patch) | |
tree | 6be478308b2c32a2c2bba5ca5b28dbd14b16f6fc /gdb | |
parent | e0ce539c578586fd2f9c54b703335fa064e42a22 (diff) | |
download | gdb-1c809c688364f87ba62a4c590b53d1efe0cff64e.zip gdb-1c809c688364f87ba62a4c590b53d1efe0cff64e.tar.gz gdb-1c809c688364f87ba62a4c590b53d1efe0cff64e.tar.bz2 |
gdb
PR c++/9708:
* dwarf2read.c (die_needs_namespace) <DW_TAG_variable>: A variable
in a lexical block does not need a namespace.
(new_symbol) <DW_TAG_variable>: Put extern variables on
list_in_scope in all cases.
gdb/testsuite
PR c++/9708:
* gdb.cp/m-static.exp: Add regression test.
* gdb.cp/m-static.cc (method): New method.
(main): Call it.
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/ChangeLog | 8 | ||||
-rw-r--r-- | gdb/dwarf2read.c | 28 | ||||
-rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
-rw-r--r-- | gdb/testsuite/gdb.cp/m-static.cc | 11 | ||||
-rw-r--r-- | gdb/testsuite/gdb.cp/m-static.exp | 5 |
5 files changed, 52 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 86b3793..d9e6fd8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2010-03-12 Tom Tromey <tromey@redhat.com> + + PR c++/9708: + * dwarf2read.c (die_needs_namespace) <DW_TAG_variable>: A variable + in a lexical block does not need a namespace. + (new_symbol) <DW_TAG_variable>: Put extern variables on + list_in_scope in all cases. + 2010-03-12 Stan Shebs <stan@codesourcery.com> * ax-gdb.c (gen_expr): Add shift expressions. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 53e2e1e..2d21edb 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -3204,6 +3204,8 @@ process_die (struct die_info *die, struct dwarf2_cu *cu) static int die_needs_namespace (struct die_info *die, struct dwarf2_cu *cu) { + struct attribute *attr; + switch (die->tag) { case DW_TAG_namespace: @@ -3231,11 +3233,17 @@ die_needs_namespace (struct die_info *die, struct dwarf2_cu *cu) spec_cu); } - if (dwarf2_attr (die, DW_AT_external, cu) - || die->parent->tag == DW_TAG_namespace) - return 1; - - return 0; + attr = dwarf2_attr (die, DW_AT_external, cu); + if (attr == NULL && die->parent->tag != DW_TAG_namespace) + return 0; + /* A variable in a lexical block of some kind does not need a + namespace, even though in C++ such variables may be external + and have a mangled name. */ + if (die->parent->tag == DW_TAG_lexical_block + || die->parent->tag == DW_TAG_try_block + || die->parent->tag == DW_TAG_catch_block) + return 0; + return 1; default: return 0; @@ -8413,7 +8421,15 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu) var_decode_location (attr, sym, cu); attr2 = dwarf2_attr (die, DW_AT_external, cu); if (attr2 && (DW_UNSND (attr2) != 0)) - add_symbol_to_list (sym, &global_symbols); + { + struct pending **list_to_add; + + /* A variable with DW_AT_external is never static, + but it may be block-scoped. */ + list_to_add = (cu->list_in_scope == &file_symbols + ? &global_symbols : cu->list_in_scope); + add_symbol_to_list (sym, list_to_add); + } else add_symbol_to_list (sym, cu->list_in_scope); } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ba8eb86..e25b727 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2010-03-12 Tom Tromey <tromey@redhat.com> + + PR c++/9708: + * gdb.cp/m-static.exp: Add regression test. + * gdb.cp/m-static.cc (method): New method. + (main): Call it. + 2010-03-12 Sami Wagiaalla <swagiaal@redhat.com> * gdb.cp/gdb2384-base.h: Created 'namespace B'. diff --git a/gdb/testsuite/gdb.cp/m-static.cc b/gdb/testsuite/gdb.cp/m-static.cc index 2a0b61c..7f997ef 100644 --- a/gdb/testsuite/gdb.cp/m-static.cc +++ b/gdb/testsuite/gdb.cp/m-static.cc @@ -15,6 +15,12 @@ protected: public: gnu_obj_1(antiquities a, long l) {} + + long method () + { + static bool svar = true; + return key2; + } }; const bool gnu_obj_1::test; @@ -70,5 +76,8 @@ int main() test4.dummy = test4.elsewhere; test4.dummy = 0; - return test4.dummy; // breakpoint: constructs-done + + test1.method (); // breakpoint: constructs-done + + return test4.dummy; } diff --git a/gdb/testsuite/gdb.cp/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp index f207462..7b4e0ca 100644 --- a/gdb/testsuite/gdb.cp/m-static.exp +++ b/gdb/testsuite/gdb.cp/m-static.exp @@ -132,5 +132,10 @@ gdb_test "print test4.nowhere" "field nowhere is nonexistent or has been optimis # that GDB's current behavior in such situations is either consistent # across platforms or optimal, so I'm not including one now. +# Step into test1.method and examine the method-scoped static. +# This is a regression test for PR 9708. +gdb_test "step" "gnu_obj_1::method.*" +gdb_test "print svar" " = true" + gdb_exit return 0 |