[SCM] master: Merge remote branch 'gdb/master'

[pmuldoon@sourceware.org]

The branch, master has been updated
       via  f03cfcef631b8b709a61f9c62e980a8e9b2df1ba (commit)
       via  9822d0d65fd29fab677141058ab001c091dcb716 (commit)
       via  6da47bfa006acd632167ba2eaf00b0952ab7224f (commit)
       via  d46a12a4692edbb95848cb8aa82ce42a0737a313 (commit)
       via  1e1cb3da9c0aad73e40d3e4d0f72c97d7b15c787 (commit)
       via  16f2c1eff82da476c48410b7bf1e6523e569ebe0 (commit)
       via  d2ec97943ab6a71a34039b90413d49c30c06611c (commit)
       via  dce8ebc2edaca7c4a0dafb0f56fb6d24842bf27f (commit)
       via  ab5fbf66c212fa7e087fd04af41b40bd347f0cf6 (commit)
       via  460494aba401d8c1c06d0860da6cc0cb5cf80597 (commit)
      from  f27f743af7cfc6b056340ac8fceca0ea7bf8b4f2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit f03cfcef631b8b709a61f9c62e980a8e9b2df1ba
Merge: f27f743 9822d0d
Author: Phil Muldoon <pmuldoon@redhat.com>
Date:   Wed Oct 20 13:48:14 2010 +0100

    Merge remote branch 'gdb/master'

commit 9822d0d65fd29fab677141058ab001c091dcb716
Author: Vladimir Prus <vladimir@codesourcery.com>
Date:   Wed Oct 20 09:10:46 2010 +0000

    	* remote.c (remote_get_threadlist): If we got empty
    	response, bail out immediately, and don't emit any
    	warnings.

commit 6da47bfa006acd632167ba2eaf00b0952ab7224f
Author: gdbadmin <gdbadmin@sourceware.org>
Date:   Wed Oct 20 00:00:33 2010 +0000

    *** empty log message ***

commit d46a12a4692edbb95848cb8aa82ce42a0737a313
Author: Alan Modra <amodra@bigpond.net.au>
Date:   Tue Oct 19 23:00:08 2010 +0000

    daily update

commit 1e1cb3da9c0aad73e40d3e4d0f72c97d7b15c787
Author: Ulrich Weigand <uweigand@de.ibm.com>
Date:   Tue Oct 19 21:30:53 2010 +0000

    	* arm-tdep.c (thumb_get_next_pc_raw): Handle Thumb-16 encoding
    	for "mov pc, REG" as well.
    	(thumb_instruction_changes_pc): Likewise.

commit 16f2c1eff82da476c48410b7bf1e6523e569ebe0
Author: Ulrich Weigand <uweigand@de.ibm.com>
Date:   Tue Oct 19 21:29:23 2010 +0000

    	* gdb.base/watch_thread_num.exp: Revert 2008-09-03 change.
    	Skip test completely if gdb,no_hardware_watchpoints.

commit d2ec97943ab6a71a34039b90413d49c30c06611c
Author: Ulrich Weigand <uweigand@de.ibm.com>
Date:   Tue Oct 19 21:28:33 2010 +0000

    	* gdb.base/foll-fork.exp: Make regexps to match catchpoint hits more
    	strict, but do not check for any particular function name within libc.

commit dce8ebc2edaca7c4a0dafb0f56fb6d24842bf27f
Author: swagiaal <swagiaal>
Date:   Tue Oct 19 20:53:13 2010 +0000

    Support overloading of 'operator->'.
    
    2010-10-19  Sami Wagiaalla  <swagiaal@redhat.com>
    
    	 PR C++/11500:
    	* valarith.c (value_x_unop): Handle STRUCTOP_PTR.
    	* eval.c (evaluate_subexp_standard): Check for overload of
    	'operator->'.
    	* valarith.c (value_x_binop): Throw NOT_FOUND_ERROR.
    	(value_x_unop): Ditto.
    	* valops.c: Include "exceptions.h".
    	(find_overload_match): Throw NOT_FOUND_ERROR.
    	(value_struct_elt): Ditto.
    
    2010-10-19  Sami Wagiaalla  <swagiaal@redhat.com>
    
    	* gdb.cp/smartp.exp: New test.
    	* gdb.cp/smartp.cc : New test.

commit ab5fbf66c212fa7e087fd04af41b40bd347f0cf6
Author: Tom Tromey <tromey@redhat.com>
Date:   Tue Oct 19 20:11:33 2010 +0000

    	* python/py-cmd.c (cmdpy_function): Unreference exception state.

commit 460494aba401d8c1c06d0860da6cc0cb5cf80597
Author: swagiaal <swagiaal>
Date:   Tue Oct 19 16:07:19 2010 +0000

    Support pointer to bool conversion.
    
    2010-10-19  Sami Wagiaalla  <swagiaal@redhat.com>
    
    	* gdbtypes.h: Introduce BOOL_PTR_CONVERSION_BADNESS.
    	* gdbtypes.c (rank_one_type): Use BOOL_PTR_CONVERSION_BADNESS
    	for conversion.
    	Make all other conversions illegal.
    
    2010-10-19  Sami Wagiaalla  <swagiaal@redhat.com>
    
    	* gdb.cp/converts.exp: Test pointer to bool conversion.
    	Test pointer to long conversion.
    	* gdb.cp/oranking.exp: Removed relevant kfail.

-----------------------------------------------------------------------

Summary of changes:
 bfd/version.h                               |    2 +-
 gdb/ChangeLog                               |   35 ++++++++++++++++++++++
 gdb/arm-tdep.c                              |   12 +++++++
 gdb/eval.c                                  |   43 +++++++++++++++++++++++++++
 gdb/gdbtypes.c                              |    4 +-
 gdb/gdbtypes.h                              |    6 +--
 gdb/python/py-cmd.c                         |    7 ++++-
 gdb/remote.c                                |    2 +-
 gdb/testsuite/ChangeLog                     |   21 +++++++++++++
 gdb/testsuite/gdb.base/foll-fork.exp        |   11 ++++---
 gdb/testsuite/gdb.base/watch_thread_num.exp |   15 +++++----
 gdb/testsuite/gdb.cp/converts.cc            |    8 ++++-
 gdb/testsuite/gdb.cp/converts.exp           |    3 ++
 gdb/testsuite/gdb.cp/oranking.exp           |    1 -
 gdb/valarith.c                              |   10 +++++-
 gdb/valops.c                                |    8 ++++-
 gdb/version.in                              |    2 +-
 17 files changed, 161 insertions(+), 29 deletions(-)

First 500 lines of diff:
diff --git a/bfd/version.h b/bfd/version.h
index b32faf0..ad9dbc4 100644
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -1,4 +1,4 @@
-#define BFD_VERSION_DATE 20101019
+#define BFD_VERSION_DATE 20101020
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bff8559..02e42da 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,38 @@
+2010-10-20  Vladimir Prus  <vladimir@codesourcery.com>
+
+	* remote.c (remote_get_threadlist): If we got empty
+	response, bail out immediately, and don't emit any
+	warnings.
+
+2010-10-19  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* arm-tdep.c (thumb_get_next_pc_raw): Handle Thumb-16 encoding
+	for "mov pc, REG" as well.
+	(thumb_instruction_changes_pc): Likewise.
+
+2010-10-19  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	 PR C++/11500:
+	* valarith.c (value_x_unop): Handle STRUCTOP_PTR.
+	* eval.c (evaluate_subexp_standard): Check for overload of
+	'operator->'.
+	* valarith.c (value_x_binop): Throw NOT_FOUND_ERROR.
+	(value_x_unop): Ditto.
+	* valops.c: Include "exceptions.h".
+	(find_overload_match): Throw NOT_FOUND_ERROR.
+	(value_struct_elt): Ditto.
+
+2010-10-19  Tom Tromey  <tromey@redhat.com>
+
+	* python/py-cmd.c (cmdpy_function): Unreference exception state.
+
+2010-10-19  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	* gdbtypes.h: Introduce BOOL_PTR_CONVERSION_BADNESS.
+	* gdbtypes.c (rank_one_type): Use BOOL_PTR_CONVERSION_BADNESS
+	for conversion.
+	Make all other conversions illegal.
+
 2010-10-18  Doug Evans  <dje@google.com>
 
 	* c-typeprint.c (c_type_print_base, case TYPE_CODE_TYPEDEF): Verify
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 5b32b8a..2df96cd 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -537,6 +537,9 @@ thumb_instruction_changes_pc (unsigned short inst)
   if ((inst & 0xff00) == 0x4700)	/* bx REG, blx REG */
     return 1;
 
+  if ((inst & 0xff87) == 0x4687)	/* mov pc, REG */
+    return 1;
+
   if ((inst & 0xf500) == 0xb100)	/* CBNZ or CBZ.  */
     return 1;
 
@@ -3572,6 +3575,15 @@ thumb_get_next_pc_raw (struct frame_info *frame, CORE_ADDR pc, int insert_bkpt)
       else
 	nextpc = get_frame_register_unsigned (frame, bits (inst1, 3, 6));
     }
+  else if ((inst1 & 0xff87) == 0x4687)	/* mov pc, REG */
+    {
+      if (bits (inst1, 3, 6) == 0x0f)
+	nextpc = pc_val;
+      else
+	nextpc = get_frame_register_unsigned (frame, bits (inst1, 3, 6));
+
+      nextpc = MAKE_THUMB_ADDR (nextpc);
+    }
   else if ((inst1 & 0xf500) == 0xb100)
     {
       /* CBNZ or CBZ.  */
diff --git a/gdb/eval.c b/gdb/eval.c
index 635db34..471dcd7 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -1510,6 +1510,28 @@ evaluate_subexp_standard (struct type *expect_type,
 	  else
 	    {
 	      arg2 = evaluate_subexp (NULL_TYPE, exp, pos, noside);
+
+	      /* Check to see if the operator '->' has been overloaded.  If the operator
+	         has been overloaded replace arg2 with the value returned by the custom
+	         operator and continue evaluation.  */
+	      while (unop_user_defined_p (op, arg2))
+		{
+		  volatile struct gdb_exception except;
+		  struct value *value = NULL;
+		  TRY_CATCH (except, RETURN_MASK_ERROR)
+		    {
+		      value = value_x_unop (arg2, op, noside);
+		    }
+
+		  if (except.reason < 0)
+		    {
+		      if (except.error == NOT_FOUND_ERROR)
+			break;
+		      else
+			throw_exception (except);
+		    }
+		  arg2 = value;
+		}
 	    }
 	  /* Now, say which argument to start evaluating from */
 	  tem = 2;
@@ -1898,6 +1920,27 @@ evaluate_subexp_standard (struct type *expect_type,
       if (noside == EVAL_SKIP)
 	goto nosideret;
 
+      /* Check to see if operator '->' has been overloaded.  If so replace
+         arg1 with the value returned by evaluating operator->().  */
+      while (unop_user_defined_p (op, arg1))
+	{
+	  volatile struct gdb_exception except;
+	  struct value *value = NULL;
+	  TRY_CATCH (except, RETURN_MASK_ERROR)
+	    {
+	      value = value_x_unop (arg1, op, noside);
+	    }
+
+	  if (except.reason < 0)
+	    {
+	      if (except.error == NOT_FOUND_ERROR)
+		break;
+	      else
+		throw_exception (except);
+	    }
+	  arg1 = value;
+	}
+
       /* JYG: if print object is on we need to replace the base type
 	 with rtti type in order to continue on with successful
 	 lookup of member / method only available in the rtti type. */
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 204bab5..d08dbfe 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -2256,7 +2256,6 @@ rank_one_type (struct type *parm, struct type *arg)
 	case TYPE_CODE_CHAR:
 	case TYPE_CODE_RANGE:
 	case TYPE_CODE_BOOL:
-	  return POINTER_CONVERSION_BADNESS;
 	default:
 	  return INCOMPATIBLE_TYPE_BADNESS;
 	}
@@ -2434,8 +2433,9 @@ rank_one_type (struct type *parm, struct type *arg)
 	case TYPE_CODE_RANGE:
 	case TYPE_CODE_ENUM:
 	case TYPE_CODE_FLT:
+	  return INCOMPATIBLE_TYPE_BADNESS;
 	case TYPE_CODE_PTR:
-	  return BOOLEAN_CONVERSION_BADNESS;
+	  return BOOL_PTR_CONVERSION_BADNESS;
 	case TYPE_CODE_BOOL:
 	  return 0;
 	default:
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index e4dac49..5617a1d 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -1415,12 +1415,10 @@ extern int is_unique_ancestor (struct type *, struct value *);
 #define FLOAT_CONVERSION_BADNESS       2
 /* Badness of integer<->floating conversions */
 #define INT_FLOAT_CONVERSION_BADNESS   2
-/* Badness of converting to a boolean */
-#define BOOLEAN_CONVERSION_BADNESS     2
-/* Badness of pointer conversion */
-#define POINTER_CONVERSION_BADNESS     2
 /* Badness of conversion of pointer to void pointer */
 #define VOID_PTR_CONVERSION_BADNESS    2
+/* Badness of conversion of pointer to boolean.  */
+#define BOOL_PTR_CONVERSION_BADNESS    3
 /* Badness of converting derived to base class */
 #define BASE_CONVERSION_BADNESS        2
 /* Badness of converting from non-reference to reference */
diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c
index 9f71290..e08b467 100644
--- a/gdb/python/py-cmd.c
+++ b/gdb/python/py-cmd.c
@@ -192,7 +192,12 @@ cmdpy_function (struct cmd_list_element *command, char *args, int from_tty)
 	    error (_("Error occurred in Python command."));
 	}
       else
-	error ("%s", msg);
+	{
+	  Py_XDECREF (ptype);
+	  Py_XDECREF (pvalue);
+	  Py_XDECREF (ptraceback);
+	  error ("%s", msg);
+	}
     }
 
   Py_DECREF (result);
diff --git a/gdb/remote.c b/gdb/remote.c
index 13a9635..68e5678 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -2353,7 +2353,7 @@ remote_get_threadlist (int startflag, threadref *nextthread, int result_limit,
   getpkt (&rs->buf, &rs->buf_size, 0);
 
   if (*rs->buf == '\0')
-    *result_count = 0;
+    return 0;
   else
     *result_count =
       parse_threadlist_response (rs->buf + 2, result_limit, &echo_nextthread,
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9208bb4..861cadb 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,24 @@
+2010-10-19  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* gdb.base/watch_thread_num.exp: Revert 2008-09-03 change.
+	Skip test completely if gdb,no_hardware_watchpoints.
+
+2010-10-19  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* gdb.base/foll-fork.exp: Make regexps to match catchpoint hits more
+	strict, but do not check for any particular function name within libc.
+
+2010-10-19  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	* gdb.cp/smartp.exp: New test.
+	* gdb.cp/smartp.cc : New test.
+
+2010-10-19  Sami Wagiaalla  <swagiaal@redhat.com>
+
+	* gdb.cp/converts.exp: Test pointer to bool conversion.
+	Test pointer to long conversion.
+	* gdb.cp/oranking.exp: Removed relevant kfail.
+
 2010-10-18  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.python/py-prettyprint.exp (run_lang_tests): Test encoding
diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp
index 4c5e53a..891aa38 100644
--- a/gdb/testsuite/gdb.base/foll-fork.exp
+++ b/gdb/testsuite/gdb.base/foll-fork.exp
@@ -122,7 +122,7 @@ proc catch_fork_child_follow {} {
 
     set bp_after_fork [gdb_get_line_number "set breakpoint here"]
 
-    gdb_test "catch fork" "Catchpoint .*(fork).*" \
+    gdb_test "catch fork" "Catchpoint \[0-9\]* \\(fork\\)" \
 	"explicit child follow, set catch fork"
 
     # Verify that the catchpoint is mentioned in an "info breakpoints",
@@ -136,7 +136,7 @@ proc catch_fork_child_follow {} {
     }
 
     gdb_test "continue" \
-	"Catchpoint.*(forked process.*),.*in .*(fork|__kernel_v?syscall).*" \
+	"Catchpoint \[0-9\]* \\(forked process \[0-9\]*\\),.*" \
 	"explicit child follow, catch fork"
 
     # Verify that the catchpoint is mentioned in an "info breakpoints",
@@ -184,7 +184,7 @@ proc catch_fork_unpatch_child {} {
 	"unpatch child, set catch fork"
 
     gdb_test "continue" \
-	"Catchpoint.*\\(forked process.*\\).*,.*in .*(fork|__kernel_v?syscall).*" \
+	"Catchpoint \[0-9\]* \\(forked process \[0-9\]*\\),.*" \
 	"unpatch child, catch fork"
 
     # Delete all breakpoints and catchpoints.
@@ -225,14 +225,15 @@ proc tcatch_fork_parent_follow {} {
 
     set bp_after_fork [gdb_get_line_number "set breakpoint here"]
 
-    gdb_test "catch fork" "Catchpoint .*(fork).*" \
+    gdb_test "catch fork" "Catchpoint \[0-9\]* \\(fork\\)" \
 	"explicit parent follow, set tcatch fork"
 
 # ??rehrauer: I don't yet know how to get the id of the tcatch
 # via this script, so that I can add a -do list to it.  For now,
 # do the follow stuff after the catch happens.
 
-    gdb_test "continue" "in .*(fork|__kernel_v?syscall).*" \
+    gdb_test "continue" \
+	"Catchpoint \[0-9\]* \\(forked process \[0-9\]*\\),.*" \
 	"explicit parent follow, tcatch fork"
 
     gdb_test_no_output "set follow-fork parent"
diff --git a/gdb/testsuite/gdb.base/watch_thread_num.exp b/gdb/testsuite/gdb.base/watch_thread_num.exp
index 7b77c0d..e5542dd 100644
--- a/gdb/testsuite/gdb.base/watch_thread_num.exp
+++ b/gdb/testsuite/gdb.base/watch_thread_num.exp
@@ -23,6 +23,12 @@ if $tracelevel then {
 	strace $tracelevel
 }
 
+# This test verifies that a watchpoint is detected in the proper thread
+# so the test is only meaningful on a system with hardware watchpoints.
+if [target_info exists gdb,no_hardware_watchpoints] {
+    return 0;
+}
+
 set testfile watch_thread_num
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
@@ -47,11 +53,6 @@ if { ![runto main] } then {
    return
 }
 
-# Disable hardware watchpoints if necessary.
-if [target_info exists gdb,no_hardware_watchpoints] {
-    gdb_test_no_output "set can-use-hw-watchpoints 0" ""
-}
-
 gdb_test "watch shared_var thread 0" "Unknown thread 0\." "Watchpoint on invalid thread"
 gdb_test "watch shared_var thread" "A syntax error in expression, near `thread'\." "Invalid watch syntax"
 
@@ -71,14 +72,14 @@ gdb_test_multiple "thread" "Thread command" {
 set thread_num "$expect_out(1,string)"
 
 gdb_test_no_output "disable 2" "Disable breakpoint 2"
-gdb_test "watch shared_var thread $thread_num" "atchpoint 3: shared_var" "Watchpoint on shared variable"
+gdb_test "watch shared_var thread $thread_num" "Hardware watchpoint 3: shared_var" "Watchpoint on shared variable"
 gdb_test "info breakpoint 3" "stop only in thread $thread_num"
 
 for {set i 1} {$i <= 10} {incr i 1} {
     set watchpoint "Watchpoint triggered iteration $i"
     set check "Check thread that triggered iteration $i"
 
-    gdb_test "continue" "atchpoint 3: shared_var.*" $watchpoint
+    gdb_test "continue" "Hardware watchpoint 3: shared_var.*" $watchpoint
     gdb_test "thread" ".*Current thread is $thread_num .*" $check
 }
 
diff --git a/gdb/testsuite/gdb.cp/converts.cc b/gdb/testsuite/gdb.cp/converts.cc
index b5e7bde..34b6927 100644
--- a/gdb/testsuite/gdb.cp/converts.cc
+++ b/gdb/testsuite/gdb.cp/converts.cc
@@ -14,7 +14,9 @@ int foo1_2 (char[]) {return 12;}
 int foo1_3 (int*)   {return 13;}
 int foo1_4 (A*)     {return 14;}
 int foo1_5 (void*)  {return 15;}
-int foo1_6 (void**) {return 15;}
+int foo1_6 (void**) {return 16;}
+int foo1_7 (bool)   {return 17;}
+int foo1_8 (long)   {return 18;}
 
 int foo2_1 (char**  )  {return 21;}
 int foo2_2 (char[][1]) {return 22;}
@@ -40,7 +42,9 @@ int main()
   foo1_3 ((int*)bp);   // ..pointer of wrong type
   foo1_4 (bp);         // ..ancestor pointer
   foo1_5 (bp);         // ..void pointer
-  foo1_6 ((void**)bp); // ..void pointer
+  foo1_6 ((void**)bp); // ..void pointer pointer
+  foo1_7 (bp);         // ..boolean
+  foo1_8 ((long)bp);   // ..long int
 
   char **b;          // pointer pointer to..
   char ba[1][1];
diff --git a/gdb/testsuite/gdb.cp/converts.exp b/gdb/testsuite/gdb.cp/converts.exp
index 121bcad..4e4c2ea 100644
--- a/gdb/testsuite/gdb.cp/converts.exp
+++ b/gdb/testsuite/gdb.cp/converts.exp
@@ -40,6 +40,9 @@ gdb_test "p foo1_3 (a)"  "Cannot resolve.*" "pointer to pointer of wrong type"
 gdb_test "p foo1_3 (bp)" "Cannot resolve.*" "pointer to pointer of wrong type"
 gdb_test "p foo1_4 (bp)" "= 14"             "pointer to ancestor pointer"
 gdb_test "p foo1_5 (bp)" "= 15"             "pointer to void pointer"
+gdb_test "p foo1_6 (bp)" "Cannot resolve.*"     "pointer to void pointer pointer"
+gdb_test "p foo1_7 (bp)" "= 17"                 "pointer to boolean"
+gdb_test "p foo1_8 (bp)" "Using non-standard.*" "pointer to long int"
 
 gdb_test "p foo1_5 (b)" "= 15"             "pointer pointer to void pointer"
 gdb_test "p foo2_1 (b)" "= 21"             "pointer pointer to pointer pointer"
diff --git a/gdb/testsuite/gdb.cp/oranking.exp b/gdb/testsuite/gdb.cp/oranking.exp
index f06933a..f1efb77 100644
--- a/gdb/testsuite/gdb.cp/oranking.exp
+++ b/gdb/testsuite/gdb.cp/oranking.exp
@@ -52,7 +52,6 @@ setup_kfail "gdb/12098" *-*-*
 gdb_test "p foo4(&a)" "24"
 
 gdb_test "p test5()" "26"
-setup_kfail "gdb/12098" *-*-*
 gdb_test "p foo5(c)" "26"
 
 gdb_test "p test6()"  "28"
diff --git a/gdb/valarith.c b/gdb/valarith.c
index 554c4ff..88f1448 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -541,7 +541,8 @@ value_x_binop (struct value *arg1, struct value *arg2, enum exp_opcode op,
 	}
       return call_function_by_hand (argvec[0], 2 - static_memfuncp, argvec + 1);
     }
-  error (_("member function %s not found"), tstr);
+  throw_error (NOT_FOUND_ERROR,
+               _("member function %s not found"), tstr);
 #ifdef lint
   return call_function_by_hand (argvec[0], 2 - static_memfuncp, argvec + 1);
 #endif
@@ -616,6 +617,9 @@ value_x_unop (struct value *arg1, enum exp_opcode op, enum noside noside)
     case UNOP_IND:
       strcpy (ptr, "*");
       break;
+    case STRUCTOP_PTR:
+      strcpy (ptr, "->");
+      break;
     default:
       error (_("Invalid unary operation specified."));
     }
@@ -641,7 +645,9 @@ value_x_unop (struct value *arg1, enum exp_opcode op, enum noside noside)
 	}
       return call_function_by_hand (argvec[0], nargs, argvec + 1);
     }
-  error (_("member function %s not found"), tstr);
+  throw_error (NOT_FOUND_ERROR,
+               _("member function %s not found"), tstr);
+
   return 0;			/* For lint -- never reached */
 }
 \f
diff --git a/gdb/valops.c b/gdb/valops.c
index fe4576e..07b62a1 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -46,6 +46,7 @@
 #include "observer.h"
 #include "objfiles.h"
 #include "symtab.h"
+#include "exceptions.h"
 
 extern int overload_debug;
 /* Local functions.  */
@@ -2215,7 +2216,8 @@ value_struct_elt (struct value **argp, struct value **args,
     }
 
   if (!v)
-    error (_("Structure has no component named %s."), name);
+    throw_error (NOT_FOUND_ERROR,
+                 _("Structure has no component named %s."), name);
   return v;
 }
 
@@ -2533,7 +2535,9 @@ find_overload_match (struct type **arg_types, int nargs,
 
   /* Did we find a match ?  */
   if (method_oload_champ == -1 && func_oload_champ == -1)
-    error (_("No symbol \"%s\" in current context."), name);
+    throw_error (NOT_FOUND_ERROR,
+                 _("No symbol \"%s\" in current context."),
+                 name);
 
   /* If we have found both a method match and a function
      match, find out which one is better, and calculate match
diff --git a/gdb/version.in b/gdb/version.in
index 5be57be..573c8ab 100644
--- a/gdb/version.in
+++ b/gdb/version.in
@@ -1 +1 @@
-7.2.50.20101019-cvs
+7.2.50.20101020-cvs


hooks/post-receive
--
Repository for Project Archer.