Merge GDB 7.5.1

gdb/typeprint.c

 /* Language independent support for printing types for GDB, the GNU debugger.
 
    Copyright (C) 1986, 1988-1989, 1991-1995, 1998-2001, 2003, 2006-2012
    Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    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
@@ skipping 55 matching lines @@
 }
 
 /* Print a description of a type TYPE in the form of a declaration of a
    variable named VARSTRING.  (VARSTRING is demangled if necessary.)
    Output goes to STREAM (via stdio).
    If SHOW is positive, we show the contents of the outermost level
    of structure even if there is a type name that could be used instead.
    If SHOW is negative, we never show the details of elements' types.  */
 
 void
-type_print (struct type *type, char *varstring, struct ui_file *stream,
+type_print (struct type *type, const char *varstring, struct ui_file *stream,
             int show)
 {
   LA_PRINT_TYPE (type, varstring, stream, show, 0);
 }
 
 /* Print TYPE to a string, returning it.  The caller is responsible for
    freeing the string.  */
 
 char *
 type_to_string (struct type *type)
@@ skipping 45 matching lines @@
     val = access_value_history (0);
 
   type = value_type (val);
 
   get_user_print_options (&opts);
   if (opts.objectprint)
     {
       if (((TYPE_CODE (type) == TYPE_CODE_PTR)
            || (TYPE_CODE (type) == TYPE_CODE_REF))
           && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CLASS))
-        {
-          real_type = value_rtti_target_type (val, &full, &top, &using_enc);
-          if (real_type)
-            {
-              if (TYPE_CODE (type) == TYPE_CODE_PTR)
-                real_type = lookup_pointer_type (real_type);
-              else
-                real_type = lookup_reference_type (real_type);
-            }
-        }
+        real_type = value_rtti_indirect_type (val, &full, &top, &using_enc);
       else if (TYPE_CODE (type) == TYPE_CODE_CLASS)
         real_type = value_rtti_type (val, &full, &top, &using_enc);
     }
 
   printf_filtered ("type = ");
 
   if (real_type)
     {
       printf_filtered ("/* real type = ");
       type_print (real_type, "", gdb_stdout, -1);
@@ skipping 46 matching lines @@
 
   CHECK_TYPEDEF (type);
 
   switch (TYPE_CODE (type))
     {
 
     case TYPE_CODE_ENUM:
       len = TYPE_NFIELDS (type);
       for (i = 0; i < len; i++)
         {
-          if (TYPE_FIELD_BITPOS (type, i) == val)
+          if (TYPE_FIELD_ENUMVAL (type, i) == val)
             {
               break;
             }
         }
       if (i < len)
         {
           fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
         }
       else
         {
@@ skipping 87 matching lines @@
 Print definition of type TYPE.\n\
 Argument may be a type name defined by typedef, or \"struct STRUCT-TAG\"\n\
 or \"class CLASS-NAME\" or \"union UNION-TAG\" or \"enum ENUM-TAG\".\n\
 The selected stack frame's lexical context is used to look up the name.\n\
 Contrary to \"whatis\", \"ptype\" always unrolls any typedefs."));
 
   add_com ("whatis", class_vars, whatis_command,
            _("Print data type of expression EXP.\n\
 Only one level of typedefs is unrolled.  See also \"ptype\"."));
 }