PR 15519

	* cp-namespace.c (find_symbol_in_baseclass): Call
	cp_lookup_symbol_in_namespace instead of cp_lookup_symbol_namespace.
	Check result of call to lookup_symbol_static.
	Call lookup_static_symbol_aux unconditionally.
	Call check_typedef on base types before accessing them.
	(cp_lookup_nested_symbol): Fix comment.

	testsuite/
	* gdb.cp/derivation2.cc: New file.
	* gdb.cp/derivation.cc (main): Call foo2.
	* gdb.cp/derivation.exp: Add tests for typedefs in another
	file, and when there's an active block.

3 files changed, 63 insertions, 6 deletions

diff --git a/gdb/testsuite/gdb.cp/derivation.cc b/gdb/testsuite/gdb.cp/derivation.cc
index 0a6a24dd450..2fefe79dedb 100644
--- a/gdb/testsuite/gdb.cp/derivation.cc
+++ b/gdb/testsuite/gdb.cp/derivation.cc
@@ -16,6 +16,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
    */
 
+extern void foo2 (); /* from derivation2.cc */
+
 namespace N {
   typedef double value_type;
   struct Base { typedef int value_type; };
@@ -306,9 +308,7 @@ int main(void)
     N::Derived::value_type d = 1;
     N::value_type n = 3.0;
     dobj.doit ();
+    foo2 ();
     return 0;
     
 }
-
-    
-    
diff --git a/gdb/testsuite/gdb.cp/derivation.exp b/gdb/testsuite/gdb.cp/derivation.exp
index 287a830caa7..66a3a3beda5 100644
--- a/gdb/testsuite/gdb.cp/derivation.exp
+++ b/gdb/testsuite/gdb.cp/derivation.exp
@@ -32,14 +32,15 @@ if { [skip_cplus_tests] } { continue }
 
 load_lib "cp-support.exp"
 
-standard_testfile .cc
+standard_testfile derivation.cc derivation2.cc
 
-if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+if {[prepare_for_testing $testfile.exp $testfile \
+	[list $srcfile $srcfile2] {debug c++}]} {
     return -1
 }
 
 # Check inheritance of typedefs.
-foreach klass {"A" "D" "E" "F"} {
+foreach klass {"A" "D" "E" "F" "A2" "D2"} {
     gdb_test "ptype ${klass}::value_type" "type = int"
     gdb_test "whatis ${klass}::value_type" "type = int"
     gdb_test "p (${klass}::value_type) 0" " = 0"
@@ -57,6 +58,13 @@ if ![runto 'marker1'] then {
     continue
 }
 
+# Check inheritance of typedefs again, but this time with an active block.
+foreach klass {"A" "D" "A2" "D2"} {
+    gdb_test "ptype ${klass}::value_type" "type = int"
+    gdb_test "whatis ${klass}::value_type" "type = int"
+    gdb_test "p (${klass}::value_type) 0" " = 0"
+}
+
 gdb_test "up" ".*main.*" "up from marker1"
 
 # Print class types and values.
diff --git a/gdb/testsuite/gdb.cp/derivation2.cc b/gdb/testsuite/gdb.cp/derivation2.cc
new file mode 100644
index 00000000000..b26cb637aa2
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/derivation2.cc
@@ -0,0 +1,49 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2013 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+   */
+
+/* A copy of some classes in derivation.cc so that we can test symbol lookup
+   in other CUs.  */
+
+class A2 {
+public:
+    typedef int value_type;
+    value_type a;
+
+    A2()
+    {
+        a=1;
+    }
+};
+
+class D2 : public A2 {
+public:
+    value_type d;
+
+    D2()
+    {
+        d=7;
+    }
+};
+
+void
+foo2 ()
+{
+  D2 d2_instance;
+  d2_instance.a = 42;
+  d2_instance.d = 43;
+}