From: Yao Qi <yao@codesourcery.com>
Date: Thu, 29 Nov 2012 07:55:10 +0000 (+0000)
Subject: gdb/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f56825018b528a7051cb2527b4be934c0306a5ef;p=binutils-gdb.git

gdb/
2012-11-29  Yao Qi  <yao@codesourcery.com>
	    Tom Tromey  <tromey@redhat.com>

	* eval.c (evaluate_subexp_standard): Get the correct pointer
	type for TYPE_CODE_MEMBERPTR.
---

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  <yao@codesourcery.com>
+	    Tom Tromey  <tromey@redhat.com>
+
+	* eval.c (evaluate_subexp_standard): Get the correct pointer
+	type for TYPE_CODE_MEMBERPTR.
+
 2012-11-28  Edjunior Machado  <emachado@linux.vnet.ibm.com>
 
 	* 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;