gdb/

Fall back linespec to minimal symbols.
	* linespec.c (decode_line_1): New variable ex, saved_argptr.  Protect
	decode_compound by TRY_CATCH, fall back on minsyms if it failed.
	(find_method, symbol_found): Change error to cplusplus_error.

gdb/testsuite/
	Fall back linespec to minimal symbols.
	* gdb.base/psymtab.exp (Don't search past end of psymtab.): Update the
	error message.
	* gdb.cp/cplusfuncs.exp (list foo::operator int*): Likewise.
	* gdb.cp/minsym-fallback-main.cc: New file.
	* gdb.cp/minsym-fallback.cc: New file.
	* gdb.cp/minsym-fallback.exp: New file.
	* gdb.cp/minsym-fallback.h: New file.

gdb/ChangeLog

@@ -1,3 +1,10 @@
+2011-07-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fall back linespec to minimal symbols.
+	* linespec.c (decode_line_1): New variable ex, saved_argptr.  Protect
+	decode_compound by TRY_CATCH, fall back on minsyms if it failed.
+	(find_method, symbol_found): Change error to cplusplus_error.
+
 2011-07-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* symtab.c (symbol_find_demangled_name): Remove DMGL_VERBOSE.

gdb/linespec.c

@@ -933,21 +933,36 @@ decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
       if (p[0] == '.' || p[1] == ':')
 	{
 	  struct symtabs_and_lines values;
+	  volatile struct gdb_exception ex;
+	  char *saved_argptr = *argptr;
 
 	  if (is_quote_enclosed)
 	    ++saved_arg;
+
+	  TRY_CATCH (ex, RETURN_MASK_ERROR)
+	    {
 	      values = decode_compound (argptr, funfirstline, canonical,
 					file_symtab, saved_arg, p);
+	    }
 	  if ((is_quoted || is_squote_enclosed) && **argptr == '\'')
 	    *argptr = *argptr + 1;
-	  return values;
-	}
 
+	  if (ex.reason >= 0)
+	    return values;
+
+	  if (ex.error != NOT_FOUND_ERROR)
+	    throw_exception (ex);
+
+	  *argptr = saved_argptr;
+	}
+      else
+	{
 	  /* If there was an exception looking up a specified filename earlier,
 	     then check whether we were really given `function:label'.   */
 	  if (file_exception.reason < 0)
 	    {
-	  function_symbol = find_function_symbol (argptr, p, is_quote_enclosed);
+	      function_symbol = find_function_symbol (argptr, p,
+						      is_quote_enclosed);
 	      /* If we did not find a function, re-throw the original
 		 exception.  */
 	      if (!function_symbol)
@@ -964,6 +979,7 @@ decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab,
 		end_quote = skip_quoted (*argptr);
 	    }
 	}
+    }
 
   /* file_symtab is specified file's symtab, or 0 if no file specified.
      If we are parsing `function:symbol', then FUNCTION_SYMBOL is the
@@ -1798,7 +1814,7 @@ find_method (int funfirstline, struct linespec_result *canonical,
 		}
 	    }
 
-	  error (_("the class `%s' does not have "
+	  cplusplus_error (saved_arg, _("the class `%s' does not have "
 					"any method instance named %s"),
 				      SYMBOL_PRINT_NAME (sym_class), copy);
 	}
@@ -2208,7 +2224,12 @@ symbol_found (int funfirstline, struct linespec_result *canonical, char *copy,
 	  return values;
 	}
       else if (funfirstline)
-	error (_("\"%s\" is not a function"), copy);
+	{
+	  /* NOT_FOUND_ERROR is not correct but it ensures COPY will be
+	     searched also as a minimal symbol.  */
+
+	  throw_error (NOT_FOUND_ERROR, _("\"%s\" is not a function"), copy);
+	}
       else if (SYMBOL_LINE (sym) != 0)
 	{
 	  /* We know its line number.  */

gdb/testsuite/ChangeLog

@@ -1,3 +1,14 @@
+2011-07-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fall back linespec to minimal symbols.
+	* gdb.base/psymtab.exp (Don't search past end of psymtab.): Update the
+	error message.
+	* gdb.cp/cplusfuncs.exp (list foo::operator int*): Likewise.
+	* gdb.cp/minsym-fallback-main.cc: New file.
+	* gdb.cp/minsym-fallback.cc: New file.
+	* gdb.cp/minsym-fallback.exp: New file.
+	* gdb.cp/minsym-fallback.h: New file.
+
 2011-07-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.cp/no-dmgl-verbose.cc: New file.

gdb/testsuite/gdb.base/psymtab.exp

@@ -71,4 +71,4 @@ gdb_test_no_output "set breakpoint pending off" "psymtab pending setup"
 # zzz::dummy currently causes a search for 'zzz' in STRUCT_NAMESPACE
 # without a preceding search for 'zzz' in VAR_NAMESPACE.
 
-gdb_test "break zzz::dummy" "Can't find member of namespace, class, struct, or union named \"zzz::dummy\"\r\n.*" "Don't search past end of psymtab."
+gdb_test "break zzz::dummy" {Function "zzz::dummy" not defined\.} "Don't search past end of psymtab."

gdb/testsuite/gdb.cp/cplusfuncs.exp

@@ -616,7 +616,7 @@ proc do_tests {} {
 
     # A regression test on errors involving operators
     gdb_test "list foo::operator $dm_type_int_star" \
-	".*the class foo does not have any method named operator $dm_type_int_star.*"
+	"Function \"foo::operator [string_to_regexp $dm_type_int_star]\" not defined\\."
 }
 
 do_tests

gdb/testsuite/gdb.cp/minsym-fallback-main.cc

@@ -0,0 +1,26 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2011 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/>.  */
+
+#include "minsym-fallback.h"
+
+C c;
+
+int
+main ()
+{
+  c.f ();
+}

gdb/testsuite/gdb.cp/minsym-fallback.cc

@@ -0,0 +1,23 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2011 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/>.  */
+
+#include "minsym-fallback.h"
+
+void
+C::f ()
+{
+}

gdb/testsuite/gdb.cp/minsym-fallback.exp

@@ -0,0 +1,38 @@
+# Copyright (C) 2011 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/>.
+
+# The goal is to have class with full DWARF symbols present in one file having
+# only a declaration there for the method.  The method is then defined in
+# a different file providing only ELF symbols.
+
+set testfile minsym-fallback
+set srcfile ${testfile}.cc
+set srcmainfile ${testfile}-main.cc
+set executable $testfile
+set objfile $objdir/$subdir/${testfile}.o
+set objmainfile $objdir/$subdir/${testfile}-main.o
+set binfile $objdir/$subdir/$executable
+if {[gdb_compile $srcdir/$subdir/$srcfile $objfile object {}] != ""
+    || [gdb_compile $srcdir/$subdir/$srcmainfile $objmainfile object {debug}] != ""
+    || [gdb_compile "$objfile $objmainfile" $binfile executable {}] != ""} {
+    untested ${testfile}.exp
+    return -1
+}
+
+clean_restart ${executable}
+
+gdb_test_no_output "set breakpoint pending off"
+
+gdb_test "break 'C::f()'" {Breakpoint [0-9]+ at 0x[0-9a-f]+}

gdb/testsuite/gdb.cp/minsym-fallback.h

@@ -0,0 +1,22 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2011 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/>.  */
+
+class C
+{
+public:
+  static void f ();
+};