From f56825018b528a7051cb2527b4be934c0306a5ef Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Thu, 29 Nov 2012 07:55:10 +0000 Subject: [PATCH] gdb/ 2012-11-29 Yao Qi Tom Tromey * eval.c (evaluate_subexp_standard): Get the correct pointer type for TYPE_CODE_MEMBERPTR. --- gdb/ChangeLog | 6 ++++++ gdb/eval.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1eb4c8f8dc3..ac85062d9c8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2012-11-29 Yao Qi + Tom Tromey + + * eval.c (evaluate_subexp_standard): Get the correct pointer + type for TYPE_CODE_MEMBERPTR. + 2012-11-28 Edjunior Machado * rs6000-tdep.c (gdb_print_insn_powerpc): Remove info->mach checking, diff --git a/gdb/eval.c b/gdb/eval.c index 55582e03292..7d48d7e42f4 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1404,13 +1404,15 @@ evaluate_subexp_standard (struct type *expect_type, { struct type *type_ptr = lookup_pointer_type (TYPE_DOMAIN_TYPE (type)); + struct type *target_type_ptr + = lookup_pointer_type (TYPE_TARGET_TYPE (type)); /* Now, convert these values to an address. */ arg2 = value_cast (type_ptr, arg2); mem_offset = value_as_long (arg1); - arg1 = value_from_pointer (type_ptr, + arg1 = value_from_pointer (target_type_ptr, value_as_long (arg2) + mem_offset); arg1 = value_ind (arg1); tem = 1; -- 2.30.2