Use scoped_value_mark in dwarf2_evaluate_loc_desc_full

[deliverable/binutils-gdb.git] / gdb / c-valprint.c

diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index 0cf2d7d972d812f284de27ef7314e418419aefe1..5993195fbe5b4c5b95987b0dd7414d1a94e6f6ed 100644 (file)
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -1,6 +1,6 @@
 /* Support for printing C values for GDB, the GNU debugger.
 
-   Copyright (C) 1986-2015 Free Software Foundation, Inc.
+   Copyright (C) 1986-2017 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -124,7 +124,9 @@ static const struct generic_val_print_decorations c_decorations =
   " * I",
   "true",
   "false",
-  "void"
+  "void",
+  "{",
+  "}"
 };
 
 /* Print a pointer based on the type of its target.
@@ -193,9 +195,9 @@ print_unpacked_pointer (struct type *type, struct type *elttype,
       if (vt_address && options->vtblprint)
        {
          struct value *vt_val;
-         struct symbol *wsym = (struct symbol *) NULL;
+         struct symbol *wsym = NULL;
          struct type *wtype;
-         struct block *block = (struct block *) NULL;
+         struct block *block = NULL;
          struct field_of_this_result is_this_fld;
 
          if (want_space)
@@ -203,7 +205,7 @@ print_unpacked_pointer (struct type *type, struct type *elttype,
 
          if (msymbol.minsym != NULL)
            wsym = lookup_symbol (MSYMBOL_LINKAGE_NAME(msymbol.minsym), block,
-                                 VAR_DOMAIN, &is_this_fld);
+                                 VAR_DOMAIN, &is_this_fld).symbol;
 
          if (wsym)
            {
@@ -231,7 +233,7 @@ static void
 c_val_print_array (struct type *type, const gdb_byte *valaddr,
                   int embedded_offset, CORE_ADDR address,
                   struct ui_file *stream, int recurse,
-                  const struct value *original_value,
+                  struct value *original_value,
                   const struct value_print_options *options)
 {
   struct type *unresolved_elttype = TYPE_TARGET_TYPE (type);
@@ -323,7 +325,7 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
            {
              i = 0;
            }
-         val_print_array_elements (type, valaddr, embedded_offset,
+         val_print_array_elements (type, embedded_offset,
                                    address, stream,
                                    recurse, original_value, options, i);
          fprintf_filtered (stream, "}");
@@ -343,7 +345,7 @@ c_val_print_array (struct type *type, const gdb_byte *valaddr,
 static void
 c_val_print_ptr (struct type *type, const gdb_byte *valaddr,
                 int embedded_offset, struct ui_file *stream, int recurse,
-                const struct value *original_value,
+                struct value *original_value,
                 const struct value_print_options *options)
 {
   struct gdbarch *arch = get_type_arch (type);
@@ -351,7 +353,7 @@ c_val_print_ptr (struct type *type, const gdb_byte *valaddr,
 
   if (options->format && options->format != 's')
     {
-      val_print_scalar_formatted (type, valaddr, embedded_offset,
+      val_print_scalar_formatted (type, embedded_offset,
                                  original_value, options, 0, stream);
     }
   else if (options->vtblprint && cp_is_vtbl_ptr_type (type))
@@ -384,7 +386,7 @@ static void
 c_val_print_struct (struct type *type, const gdb_byte *valaddr,
                    int embedded_offset, CORE_ADDR address,
                    struct ui_file *stream, int recurse,
-                   const struct value *original_value,
+                   struct value *original_value,
                    const struct value_print_options *options)
 {
   if (options->vtblprint && cp_is_vtbl_ptr_type (type))
@@ -416,7 +418,7 @@ static void
 c_val_print_union (struct type *type, const gdb_byte *valaddr,
                   int embedded_offset, CORE_ADDR address,
                   struct ui_file *stream, int recurse,
-                  const struct value *original_value,
+                  struct value *original_value,
                   const struct value_print_options *options)
 {
   if (recurse && !options->unionprint)
@@ -435,7 +437,7 @@ c_val_print_union (struct type *type, const gdb_byte *valaddr,
 static void
 c_val_print_int (struct type *type, struct type *unresolved_type,
                 const gdb_byte *valaddr, int embedded_offset,
-                struct ui_file *stream, const struct value *original_value,
+                struct ui_file *stream, struct value *original_value,
                 const struct value_print_options *options)
 {
   struct gdbarch *arch = get_type_arch (type);
@@ -447,7 +449,7 @@ c_val_print_int (struct type *type, struct type *unresolved_type,
 
       opts.format = (options->format ? options->format
                     : options->output_format);
-      val_print_scalar_formatted (type, valaddr, embedded_offset,
+      val_print_scalar_formatted (type, embedded_offset,
                                  original_value, &opts, 0, stream);
     }
   else
@@ -474,7 +476,7 @@ static void
 c_val_print_memberptr (struct type *type, const gdb_byte *valaddr,
                       int embedded_offset, CORE_ADDR address,
                       struct ui_file *stream, int recurse,
-                      const struct value *original_value,
+                      struct value *original_value,
                       const struct value_print_options *options)
 {
   if (!options->format)
@@ -483,7 +485,7 @@ c_val_print_memberptr (struct type *type, const gdb_byte *valaddr,
     }
   else
     {
-      generic_val_print (type, valaddr, embedded_offset, address, stream,
+      generic_val_print (type, embedded_offset, address, stream,
                         recurse, original_value, options, &c_decorations);
     }
 }
@@ -492,13 +494,14 @@ c_val_print_memberptr (struct type *type, const gdb_byte *valaddr,
    function; they are identical.  */
 
 void
-c_val_print (struct type *type, const gdb_byte *valaddr,
+c_val_print (struct type *type,
             int embedded_offset, CORE_ADDR address,
             struct ui_file *stream, int recurse,
-            const struct value *original_value,
+            struct value *original_value,
             const struct value_print_options *options)
 {
   struct type *unresolved_type = type;
+  const gdb_byte *valaddr = value_contents_for_printing (original_value);
 
   type = check_typedef (type);
   switch (TYPE_CODE (type))
@@ -552,7 +555,7 @@ c_val_print (struct type *type, const gdb_byte *valaddr,
     case TYPE_CODE_COMPLEX:
     case TYPE_CODE_CHAR:
     default:
-      generic_val_print (type, valaddr, embedded_offset, address,
+      generic_val_print (type, embedded_offset, address,
                         stream, recurse, original_value, options,
                         &c_decorations);
       break;
@@ -565,7 +568,8 @@ c_value_print (struct value *val, struct ui_file *stream,
               const struct value_print_options *options)
 {
   struct type *type, *real_type, *val_type;
-  int full, top, using_enc;
+  int full, using_enc;
+  LONGEST top;
   struct value_print_options opts = *options;
 
   opts.deref_ref = 1;
@@ -611,7 +615,7 @@ c_value_print (struct value *val, struct ui_file *stream,
          fprintf_filtered (stream, "(");
 
          if (value_entirely_available (val))
-           {
+           {
              real_type = value_rtti_indirect_type (val, &full, &top,
                                                    &using_enc);
              if (real_type)
@@ -623,18 +627,19 @@ c_value_print (struct value *val, struct ui_file *stream,
                  val = value_from_pointer (real_type,
                                            value_as_address (val) - top);
 
-                 if (is_ref)
-                   {
-                     val = value_ref (value_ind (val));
-                     type = value_type (val);
-                   }
-
                  /* Note: When we look up RTTI entries, we don't get
                     any information on const or volatile
                     attributes.  */
                }
            }
-          type_print (type, "", stream, -1);
+
+         if (is_ref)
+           {
+             val = value_ref (value_ind (val));
+             type = value_type (val);
+           }
+
+         type_print (type, "", stream, -1);
          fprintf_filtered (stream, ") ");
          val_type = type;
        }
@@ -665,7 +670,7 @@ c_value_print (struct value *val, struct ui_file *stream,
          /* Print out object: enclosing type is same as real_type if
             full.  */
          val_print (value_enclosing_type (val),
-                    value_contents_for_printing (val), 0,
+                    0,
                     value_address (val), stream, 0,
                     val, &opts, current_language);
          return;
@@ -678,7 +683,7 @@ c_value_print (struct value *val, struct ui_file *stream,
          fprintf_filtered (stream, "(%s ?) ",
                            TYPE_NAME (value_enclosing_type (val)));
          val_print (value_enclosing_type (val),
-                    value_contents_for_printing (val), 0,
+                    0,
                     value_address (val), stream, 0,
                     val, &opts, current_language);
          return;
@@ -686,7 +691,7 @@ c_value_print (struct value *val, struct ui_file *stream,
       /* Otherwise, we end up at the return outside this "if".  */
     }
 
-  val_print (val_type, value_contents_for_printing (val),
+  val_print (val_type,
             value_embedded_offset (val),
             value_address (val),
             stream, 0,