diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/cp-support.c | 6 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/typedef-operator.cc | 31 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/typedef-operator.exp | 33 | ||||
| -rw-r--r-- | gdb/valarith.c | 12 |
6 files changed, 83 insertions, 11 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bd987d61e7d..1f08f84234b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2011-02-18 Jan Kratochvil <jan.kratochvil@redhat.com> + Tom Tromey <tromey@redhat.com> + + * cp-support.c (make_symbol_overload_list_namespace): Do not call + make_symbol_overload_list_block with NULL BLOCK. + * valarith.c (unop_user_defined_p): Resolve also TYPE_CODE_TYPEDEF. + 2011-02-18 Pedro Alves <pedro@codesourcery.com> * breakpoint.c (get_number_trailer): No longer accept a NULL PP. diff --git a/gdb/cp-support.c b/gdb/cp-support.c index afa5c21fe89..bb1563f3240 100644 --- a/gdb/cp-support.c +++ b/gdb/cp-support.c @@ -778,11 +778,13 @@ make_symbol_overload_list_namespace (const char *func_name, /* Look in the static block. */ block = block_static_block (get_selected_block (0)); - make_symbol_overload_list_block (name, block); + if (block) + make_symbol_overload_list_block (name, block); /* Look in the global block. */ block = block_global_block (block); - make_symbol_overload_list_block (name, block); + if (block) + make_symbol_overload_list_block (name, block); } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7aaf3700021..8ef2fcdd9cd 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-02-18 Jan Kratochvil <jan.kratochvil@redhat.com> + + * gdb.cp/typedef-operator.exp: New file. + * gdb.cp/typedef-operator.cc: New file. + 2011-02-17 Michael Snyder <msnyder@vmware.com> * gdb.threads/thread-find.exp: Fix regular expressions. diff --git a/gdb/testsuite/gdb.cp/typedef-operator.cc b/gdb/testsuite/gdb.cp/typedef-operator.cc new file mode 100644 index 00000000000..1cfedaaa6d4 --- /dev/null +++ b/gdb/testsuite/gdb.cp/typedef-operator.cc @@ -0,0 +1,31 @@ +/* This test case 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: + int operator* () { return 42; } +}; +typedef C D; + +D u; +D &v = u; + +int main () +{ + return *v; +} diff --git a/gdb/testsuite/gdb.cp/typedef-operator.exp b/gdb/testsuite/gdb.cp/typedef-operator.exp new file mode 100644 index 00000000000..64ecef7eb5a --- /dev/null +++ b/gdb/testsuite/gdb.cp/typedef-operator.exp @@ -0,0 +1,33 @@ +# 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/>. + +# This file is part of the gdb testsuite. + +if {[skip_cplus_tests]} { continue } + +set testfile "typedef-operator" +if [prepare_for_testing $testfile $testfile $testfile.cc {c++ debug}] { + return -1 +} + +gdb_test_no_output "set language c++" + +gdb_test "p *u" {You can't do that without a process to debug.} "test crash" + +if ![runto_main] { + return -1 +} + +gdb_test "p *v" " = 42" "test typedef" diff --git a/gdb/valarith.c b/gdb/valarith.c index 787fc69390c..68f649f3c07 100644 --- a/gdb/valarith.c +++ b/gdb/valarith.c @@ -315,15 +315,9 @@ unop_user_defined_p (enum exp_opcode op, struct value *arg1) if (op == UNOP_ADDR) return 0; type1 = check_typedef (value_type (arg1)); - for (;;) - { - if (TYPE_CODE (type1) == TYPE_CODE_STRUCT) - return 1; - else if (TYPE_CODE (type1) == TYPE_CODE_REF) - type1 = TYPE_TARGET_TYPE (type1); - else - return 0; - } + if (TYPE_CODE (type1) == TYPE_CODE_REF) + type1 = check_typedef (TYPE_TARGET_TYPE (type1)); + return TYPE_CODE (type1) == TYPE_CODE_STRUCT; } /* Try to find an operator named OPERATOR which takes NARGS arguments |