diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 32620a2af2..a877d0b30f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-15  Tom Tromey  <tromey@redhat.com>
+
+	* dwarf2read.c (dw2_find_symbol_file): Unconditionally use
+	init_cutu_and_read_dies.
+
 2012-06-15  Iain Sandoe <iain@codesourcery.com>
 
 	* MAINTAINERS (Write After Approval): Add myself to the list.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 1fdd81916c..a8cd1584bf 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2906,12 +2906,8 @@ dw2_find_symbol_file (struct objfile *objfile, const char *name)
   if (per_cu->v.quick->symtab != NULL)
     return per_cu->v.quick->symtab->filename;
 
-  if (per_cu->is_debug_types)
-    init_cutu_and_read_dies (per_cu, 0, 0, dw2_get_primary_filename_reader,
-			     &filename);
-  else
-    init_cutu_and_read_dies_simple (per_cu, dw2_get_primary_filename_reader,
-				    &filename);
+  init_cutu_and_read_dies (per_cu, 0, 0, dw2_get_primary_filename_reader,
+			   &filename);
 
   return filename;
 }
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1e018e2776..613dc65edd 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-15  Tom Tromey  <tromey@redhat.com>
+
+	* gdb.cp/namespace.exp: Add "show lang" test.
+
 2012-06-15  Iain Sandoe <iain@codesourcery.com>
 
 	* gdb.base/list.exp (test_listsize): Remove $use_gdb_stub special
diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp
index cf5a85899e..82018c6441 100644
--- a/gdb/testsuite/gdb.cp/namespace.exp
+++ b/gdb/testsuite/gdb.cp/namespace.exp
@@ -66,6 +66,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
+gdb_test "show lang" "auto; currently c\\+\\+.*"
 
 #
 # set it up at a breakpoint so we can play with the variable values