Re: [patch] PR 11992 "Regression: C++ this scope sometimes does not work"

[sami wagiaalla <swagiaal@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 461 bytes --]


> [ I would not call it "gcc 4.4.4", it is gcc-4.4.4-10.fc13 which is far from
> FSF GCC 4.4.4. ]
>

Gotcha!

> Anyway while it fixes the problem for me on Fedora 13 x86_64 (and even others)
> the testcase does not FAIL with FSF GDB HEAD (reproducing the problem from
> Dodji as is in the PR).
>

You are right. My bad; I should not have missed that. I fixed the test 
case by giving the new functions their own unique names.

I will commit the attached patch

[-- Attachment #2: this_regression.patch --]
[-- Type: text/x-patch, Size: 1973 bytes --]

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/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..e2190f1 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 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 d5e6c3f..34abe77 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 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"