2010-05-07 Michael Snyder <msnyder@vmware.com>

	* valops.c (value_cast_pointers): Restore unused variable 'type1',
	and use it to compute variable 't1'.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f467315215695f2139638de708dfb4f8789a0c4f..950ce2f1709c034a0fe29fa85a02a8ce2336838f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-07  Michael Snyder  <msnyder@vmware.com>
+
+       * valops.c (value_cast_pointers): Restore unused variable 'type1',
+       and use it to compute variable 't1'.
+
 2010-05-07  Joel Brobecker  <brobecker@adacore.com>
 
        * ada-lang.c (assign_aggregate): Remove unused variable.

diff --git a/gdb/valops.c b/gdb/valops.c
index 7979db91c004147cde52c5036d9abce0ee7b61ff..e18d9c802a71441ebbade0050aafd57bc4819c6f 100644 (file)
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -300,8 +300,9 @@ value_cast_structs (struct type *type, struct value *v2)
 struct value *
 value_cast_pointers (struct type *type, struct value *arg2)
 {
+  struct type *type1 = check_typedef (type);
   struct type *type2 = check_typedef (value_type (arg2));
-  struct type *t1 = check_typedef (TYPE_TARGET_TYPE (type));
+  struct type *t1 = check_typedef (TYPE_TARGET_TYPE (type1));
   struct type *t2 = check_typedef (TYPE_TARGET_TYPE (type2));
 
   if (TYPE_CODE (t1) == TYPE_CODE_STRUCT