Fix PR 11992: C++ 'this' scope sometimes does not work

2010-09-13  Sami Wagiaalla  <swagiaal@redhat.com>

	PR symtab/11992:
	* c-exp.y (classify_name): Check is_a_member_of_this before returning
	UNKNOWN_CPP_NAME.

2010-09-13  Sami Wagiaalla  <swagiaal@redhat.com>

	* gdb.cp/koenig.cc: created class for testing member lookup.
	* gdb.cp/koenig.exp: Added test for member lookup.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9c3478bad7de15914e51a9627d0d3404da218306..098406044e5a507306f3b98fddd2d1eca88493c0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-13  Sami Wagiaalla  <swagiaal@redhat.com>
+
+       PR symtab/11992:
+       * c-exp.y (classify_name): Check is_a_member_of_this before returning
+       UNKNOWN_CPP_NAME.
+
 2010-09-13  Joel Brobecker  <brobecker@adacore.com>
 
        * NEWS: Add x86-lynxos to the list of platforms supported by

diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 663e778bd412cad466be823d8aee8bc6fb532eb3..57e09b33b23933f7d68950daaad0f0cc35db1536 100644 (file)
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -2389,6 +2389,7 @@ classify_name (struct block *block)
 
   if (sym == NULL
       && parse_language->la_language == language_cplus
+      && !is_a_field_of_this
       && !lookup_minimal_symbol (copy, NULL, NULL))
     return UNKNOWN_CPP_NAME;
 

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a2a4eeef30c870a7384f20c366a868851931d695..0bcaa7e41474450c1429782e8949bd072d3e4ee1 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-13  Sami Wagiaalla  <swagiaal@redhat.com>
+
+       * gdb.cp/koenig.cc: created class for testing member lookup.
+       * gdb.cp/koenig.exp: Added test for member lookup.
+
 2010-09-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        Fix false FAILs on sourcetree topdir directory containing "kill".

diff --git a/gdb/testsuite/gdb.cp/koenig.cc b/gdb/testsuite/gdb.cp/koenig.cc
index c91dbf95c8ad44aa1a8c4f89a9652598663ae280..e2190f1c6c779377e678d4b632f278946b9e3a50 100644 (file)
--- a/gdb/testsuite/gdb.cp/koenig.cc
+++ b/gdb/testsuite/gdb.cp/koenig.cc
@@ -226,6 +226,16 @@ namespace P {
 
 //------------
 
+class R {
+  public:
+    int rfoo(){ return 31; }
+    int rbar(){
+      return 1; // marker1
+    }
+};
+
+//------------
+
 int
 main ()
 {
@@ -299,6 +309,10 @@ main ()
 
   ++q;
 
+  R r;
+  r.rbar();
+  r.rfoo();
+
   return first (0, c) + foo (eo) +
          foo (eo, eo) + foo (eo, eo, 1)  +
          foo (fo, eo) + foo (1  ,fo, eo) +

diff --git a/gdb/testsuite/gdb.cp/koenig.exp b/gdb/testsuite/gdb.cp/koenig.exp
index d5e6c3f61326c5515b60ef911e25009e9394fff1..34abe77ce727005869518c3fa092fcc9ebbb61a0 100644 (file)
--- a/gdb/testsuite/gdb.cp/koenig.exp
+++ b/gdb/testsuite/gdb.cp/koenig.exp
@@ -115,3 +115,14 @@ gdb_test "p q + 5" "= 29"
 # some unary operators for good measure
 # Cannot resolve function operator++ to any overloaded instance
 gdb_test "p ++q" "= 30"
+
+# Test that koening lookup does not affect
+# member variable lookup.
+gdb_test "p r.rfoo()" "= 31"
+
+# Do the same from inside class R.
+gdb_breakpoint [gdb_get_line_number "marker1"]
+gdb_continue_to_breakpoint "marker1"
+
+gdb_test "p rfoo()" "= 31"
+gdb_test "p this->rfoo()" "= 31"