diff options
-rw-r--r-- | gdb/eval.c | 34 | ||||
-rw-r--r-- | gdb/testsuite/gdb.cp/userdef.cc | 22 | ||||
-rw-r--r-- | gdb/testsuite/gdb.cp/userdef.exp | 10 |
3 files changed, 63 insertions, 3 deletions
@@ -588,14 +588,38 @@ evaluate_subexp_do_call (expression *exp, enum noside noside, { if (callee == NULL) error (_("Cannot evaluate function -- may be inlined")); + + type *ftype = callee->type (); + + /* If the callee is a struct, there might be a user-defined function call + operator that should be used instead. */ + std::vector<value *> vals; + if (overload_resolution + && exp->language_defn->la_language == language_cplus + && check_typedef (ftype)->code () == TYPE_CODE_STRUCT) + { + /* Include space for the `this' pointer at the start. */ + vals.resize (argvec.size () + 1); + + vals[0] = value_addr (callee); + for (int i = 0; i < argvec.size (); ++i) + vals[i + 1] = argvec[i]; + + int static_memfuncp; + find_overload_match (vals, "operator()", METHOD, &vals[0], nullptr, + &callee, nullptr, &static_memfuncp, 0, noside); + if (!static_memfuncp) + argvec = vals; + + ftype = callee->type (); + } + if (noside == EVAL_AVOID_SIDE_EFFECTS) { /* If the return type doesn't look like a function type, call an error. This can happen if somebody tries to turn a variable into a function call. */ - type *ftype = callee->type (); - if (ftype->code () == TYPE_CODE_INTERNAL_FUNCTION) { /* We don't know anything about what the internal @@ -666,9 +690,13 @@ operation::evaluate_funcall (struct type *expect_type, struct type *type = callee->type (); if (type->code () == TYPE_CODE_PTR) type = type->target_type (); + /* If type is a struct, num_fields would refer to the number of + members in the type, not the number of arguments. */ + bool type_has_arguments + = type->code () == TYPE_CODE_FUNC || type->code () == TYPE_CODE_METHOD; for (int i = 0; i < args.size (); ++i) { - if (i < type->num_fields ()) + if (type_has_arguments && i < type->num_fields ()) vals[i] = args[i]->evaluate (type->field (i).type (), exp, noside); else vals[i] = args[i]->evaluate_with_coercion (exp, noside); diff --git a/gdb/testsuite/gdb.cp/userdef.cc b/gdb/testsuite/gdb.cp/userdef.cc index 7741917..7e045e4 100644 --- a/gdb/testsuite/gdb.cp/userdef.cc +++ b/gdb/testsuite/gdb.cp/userdef.cc @@ -307,8 +307,21 @@ class Member { public: int z; + + int operator() (); + int operator() (int); }; +int Member::operator() () +{ + return z; +} + +int Member::operator() (int value) +{ + return value * z; +} + bool operator== (const Member &m1, const Member &m2) { return m1.z == m2.z; @@ -335,9 +348,11 @@ int main (void) Container c; Member mem1, mem2; int val; + Member Container::* mptr = &Container::m; mem1.z = 5; mem2.z = 7; + c.m.z = 8; marker1(); // marker1-returns-here cout << one; // marker1-returns-here @@ -404,6 +419,13 @@ int main (void) ++three; cout << "preinc " << three; + val = mem1 (); + cout << "funcall " << val << endl; + val = mem1 (10); + cout << "funcall 2 " << val << endl; + val = (c.*mptr) (11); + cout << "funcall 3 " << val << endl; + (*c).z = 1; return 0; diff --git a/gdb/testsuite/gdb.cp/userdef.exp b/gdb/testsuite/gdb.cp/userdef.exp index e96636b..869f4bc 100644 --- a/gdb/testsuite/gdb.cp/userdef.exp +++ b/gdb/testsuite/gdb.cp/userdef.exp @@ -132,4 +132,14 @@ gdb_test "ptype &*c" "type = (struct|class) Member {(\[\r\n \]+public:)?\[\r\n \ gdb_test "print operator== (mem1, mem2)" " = false" gdb_test "print operator== (mem1, mem1)" " = true" +gdb_test "print mem1()" " = 5" +gdb_test "print mem1(10)" " = 50" +gdb_test "print (*&mem1)(2)" " = 10" +gdb_test "print (c.*mptr)(3)" " = 24" +gdb_test "print (&c)->m(4)" " = 32" +gdb_test "print c.m(5)" " = 40" +gdb_test "print sizeof(mem1(0))/sizeof(int)" " = 1" +gdb_test "ptype mem1(0)" "type = int" +gdb_test "print one()" "Couldn't find method A1::operator\\(\\)" + gdb_exit |