Fix dwarf2loc.h::dwarf2_evaluate_property function description.

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

diff --git a/gdb/jv-valprint.c b/gdb/jv-valprint.c
index f465ca09e35ca2b3d382fb705b78825b99b06c40..91b45e21c0e63f3415b7ac5de47ddf76a582ecd1 100644 (file)
--- a/gdb/jv-valprint.c
+++ b/gdb/jv-valprint.c
@@ -1,6 +1,6 @@
 /* Support for printing Java values for GDB, the GNU debugger.
 
-   Copyright (C) 1997-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-2014 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -29,8 +29,6 @@
 #include "jv-lang.h"
 #include "c-lang.h"
 #include "annotate.h"
-#include <string.h>
-
 /* Local functions */
 
 void
@@ -65,6 +63,7 @@ java_value_print (struct value *val, struct ui_file *stream,
          type = lookup_pointer_type (type);
 
          val = value_at (type, address);
+         type = value_type (val);
        }
     }
 
@@ -182,10 +181,10 @@ java_value_print (struct value *val, struct ui_file *stream,
                  set_value_offset (next_v, value_offset (next_v)
                                    + TYPE_LENGTH (el_type));
                  value_fetch_lazy (next_v);
-                 if (!(value_available_contents_eq
-                       (v, value_embedded_offset (v),
-                        next_v, value_embedded_offset (next_v),
-                        TYPE_LENGTH (el_type))))
+                 if (!value_contents_eq (v, value_embedded_offset (v),
+                                         next_v,
+                                         value_embedded_offset (next_v),
+                                         TYPE_LENGTH (el_type)))
                    break;
                }
 
@@ -392,11 +391,6 @@ java_print_value_fields (struct type *type, const gdb_byte *valaddr,
                {
                  fputs_filtered (_("<synthetic pointer>"), stream);
                }
-             else if (!value_bits_valid (val, TYPE_FIELD_BITPOS (type, i),
-                                         TYPE_FIELD_BITSIZE (type, i)))
-               {
-                 val_print_optimized_out (val, stream);
-               }
              else
                {
                  struct value_print_options opts;