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

2010-09-10  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-10  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/c-exp.y b/gdb/c-exp.y
index 663e778..57e09b3 100644
--- 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/gdb.cp/koenig.cc b/gdb/testsuite/gdb.cp/koenig.cc
index c91dbf9..d5e7bbe 100644
--- a/gdb/testsuite/gdb.cp/koenig.cc
+++ b/gdb/testsuite/gdb.cp/koenig.cc
@@ -226,6 +226,16 @@ namespace P {
 
 //------------
 
+class R {
+  public:
+    int foo(){ return 31; }
+    int bar(){
+      return foo()+1; // marker1
+    }
+};
+
+//------------
+
 int
 main ()
 {
@@ -299,6 +309,9 @@ main ()
 
   ++q;
 
+  R r;
+  r.bar();
+
   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 d5e6c3f..d291a6e 100644
--- 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 effect
+# member variable lookup
+gdb_test "p r.foo()" "= 31"
+
+# Do the same from inside class R
+gdb_breakpoint [gdb_get_line_number "marker1"]
+gdb_continue_to_breakpoint "marker1"
+
+gdb_test "p foo()" "= 31"
+gdb_test "p this->foo()" "= 31"