[expr-cumulative] RFA fix PR 9708

[Tom Tromey <tromey at redhat dot com>]

Consider this code:

    struct K {
      int m () {
        static bool themagicstatic = false;

        return themagicstatic ? 23 : 24;
      }
    };

To my surprise, `themagicstatic' is actually marked extern and given a
mangled name:

    08049738 V K::m()::themagicstatic

I imagine this is so that K::m can be inlined, though I'm not sure.

In any case, PR 9708 is that if the inferior is stopped in K::m, then
"print themagicstatic" will not work.

I tracked this down to two problems.  First, one case in new_symbol was
unconditionally using the global scope for such symbols.  Second,
die_needs_namespace needed a tweak.

Built and regtested on x86-64 (compile farm).
New test included.  Please review.

I'll send this upstream once the physname patches go in there.

Tom

2010-01-26  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-01-26  Tom Tromey  <tromey@redhat.com>

	PR c++/9708:
	* gdb.cp/m-static.exp: Add regression test.

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 09c1cae..ccecc3d 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2644,6 +2644,13 @@ die_needs_namespace (struct die_info *die, struct dwarf2_cu *cu)
 	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;
       }
       break;
@@ -8498,7 +8505,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/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