aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog12
-rw-r--r--gdb/eval.c43
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/valarith.c10
-rw-r--r--gdb/valops.c8
5 files changed, 74 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d2b0c89..13336ba 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+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.
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/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 824796e..2bdc9d0 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
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.
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 */
}
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