[commit#2] [PATCH v5 6/7] compile: New 'compile print'

[Jan Kratochvil <jan dot kratochvil at redhat dot com>]

On Sat, 16 May 2015 14:58:14 +0200, Jan Kratochvil wrote:
> On Fri, 15 May 2015 19:04:03 +0200, Pedro Alves wrote:
> > On 05/13/2015 09:17 PM, Jan Kratochvil wrote:
> > > +  if (TYPE_CODE (gdb_type) != TYPE_CODE_PTR)
> > > +    error (_("Invalid type code %d of symbol \"%s\" "
> > > +	     "in compiled module \"%s\"."),
> > > +	   TYPE_CODE (gdb_type_from_ptr), COMPILE_I_EXPR_VAL,
> > > +	   objfile_name (objfile));
> > > +  
> > > +  switch (TYPE_CODE (gdb_type_from_ptr))
> > > +    {
> > > +    case TYPE_CODE_ARRAY:
> > > +      retval = gdb_type_from_ptr;
> > > +      gdb_type_from_ptr = TYPE_TARGET_TYPE (gdb_type_from_ptr);
> > > +      break;
> > > +    case TYPE_CODE_FUNC:
> > > +      retval = gdb_type_from_ptr;
> > 
> > AFAIC, retval is always gdb_type_from_ptr, and could be
> > moved out of the switch.
> 
> It was written this way as it has semantical logic - how the type is
> determined depends on TYPE_CODE_* of that object.  Just accidentally in this
> case it is the same.  I do not do performance micro-optimizations which
> compiler will do anyway.  But I have changed it.

I see I made a thinko in that optimization, therefore checked-in this fix-up:
	4d18dfad9edf822df205edc2c1fe3fe9f1e467b8


Jan

--- Begin Message ---

• From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
• Date: Sat, 16 May 2015 15:36:33 +0200
• Subject: [PATCH] compile: Fix detected inferior type

gdb/ChangeLog
2015-05-16  Jan Kratochvil  <jan.kratochvil@redhat.com>

	* compile/compile-object-load.c (get_out_value_type): Fix returned type.
---
 gdb/ChangeLog                     | 4 ++++
 gdb/compile/compile-object-load.c | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3868599..e5de834 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,4 +1,8 @@
 2015-05-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* compile/compile-object-load.c (get_out_value_type): Fix returned type.
+
+2015-05-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
 	    Phil Muldoon  <pmuldoon@redhat.com>
 
 	* NEWS (Changes since GDB 7.9): Add compile print.
diff --git a/gdb/compile/compile-object-load.c b/gdb/compile/compile-object-load.c
index ed5ef88..e2d8f2f 100644
--- a/gdb/compile/compile-object-load.c
+++ b/gdb/compile/compile-object-load.c
@@ -372,7 +372,7 @@ get_out_value_type (struct symbol *func_sym, struct objfile *objfile,
 		    enum compile_i_scope_types scope)
 {
   struct symbol *gdb_ptr_type_sym, *gdb_val_sym;
-  struct type *gdb_ptr_type, *gdb_type_from_ptr, *gdb_type;
+  struct type *gdb_ptr_type, *gdb_type_from_ptr, *gdb_type, *retval;
   const struct block *block;
   const struct blockvector *bv;
   int nblocks = 0;
@@ -440,6 +440,7 @@ get_out_value_type (struct symbol *func_sym, struct objfile *objfile,
 	   TYPE_CODE (gdb_type_from_ptr), COMPILE_I_EXPR_VAL,
 	   objfile_name (objfile));
   
+  retval = gdb_type_from_ptr;
   switch (TYPE_CODE (gdb_type_from_ptr))
     {
     case TYPE_CODE_ARRAY:
@@ -461,7 +462,7 @@ get_out_value_type (struct symbol *func_sym, struct objfile *objfile,
 	   objfile_name (objfile));
   if (scope == COMPILE_I_PRINT_ADDRESS_SCOPE)
     return NULL;
-  return gdb_type_from_ptr;
+  return retval;
 }
 
 /* Fetch the type of first parameter of FUNC_SYM.
-- 
2.1.0

--- End Message ---