Fix Ada value printing on PPC64

The val_print removal patches introduced an Ada regression on PPC64
(probably any big-endian system).

The issue comes because value_field does not understand that Ada
wrapper fields can be bitfields that wrap a non-scalar type.  In this
case the value is already left-justified, so the justification done
there does the wrong thing.

Perhaps it would be good, eventually, to change value_field to
understand this case.  In the meantime this implements an Ada-specific
solution.

gdb/ChangeLog
2020-05-11  Tom Tromey  <tromey@adacore.com>

	* ada-lang.c (ada_value_primitive_field): Now public.
	* ada-lang.h (ada_value_primitive_field): Declare.
	* ada-valprint.c (print_field_values): Use
	ada_value_primitive_field for wrapper fields.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a0921f4667fd280072b9e55ce49a7a54f7a04342..c88961fac1ac9c4a0d60fb75e394f7427a58e5c0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2020-05-11  Tom Tromey  <tromey@adacore.com>
+
+       * ada-lang.c (ada_value_primitive_field): Now public.
+       * ada-lang.h (ada_value_primitive_field): Declare.
+       * ada-valprint.c (print_field_values): Use
+       ada_value_primitive_field for wrapper fields.
+
 2020-05-11  Tom de Vries  <tdevries@suse.de>
 
        * dwarf2/index-write.c (debug_names::psymbol_tag): Handle

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index be26231524d241246c048f7a4f7c35170b03ec3e..db6f606d11263f2efa85ae683a5a20c2878fe1e7 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -204,9 +204,6 @@ static struct symbol *standard_lookup (const char *, const struct block *,
 static struct value *ada_search_struct_field (const char *, struct value *, int,
                                               struct type *);
 
-static struct value *ada_value_primitive_field (struct value *, int, int,
-                                                struct type *);
-
 static int find_struct_field (const char *, struct type *, int,
                               struct type **, int *, int *, int *, int *);
 
@@ -7125,7 +7122,7 @@ ada_in_variant (LONGEST val, struct type *type, int field_num)
    fields.  FIELDNO says which field.   Differs from value_primitive_field
    only in that it can handle packed values of arbitrary type.  */
 
-static struct value *
+struct value *
 ada_value_primitive_field (struct value *arg1, int offset, int fieldno,
                            struct type *arg_type)
 {

diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
index bb9e3c3027b4d7ec9106874bdad7a7fbf6cec893..c0a71091e35515dcd1749636c85f614b67efe472 100644 (file)
--- a/gdb/ada-lang.h
+++ b/gdb/ada-lang.h
@@ -234,6 +234,11 @@ extern struct bound_minimal_symbol ada_lookup_simple_minsym (const char *);
 
 extern int ada_scan_number (const char *, int, LONGEST *, int *);
 
+extern struct value *ada_value_primitive_field (struct value *arg1,
+                                               int offset,
+                                               int fieldno,
+                                               struct type *arg_type);
+
 extern struct type *ada_parent_type (struct type *);
 
 extern int ada_is_ignored_field (struct type *, int);

diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index 31f3a50b340aa36f510de9adbfbf524942647444..010446d70f818a7d83511591e2468029d0ed8a82 100644 (file)
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -609,7 +609,8 @@ print_field_values (struct value *value, struct value *outer_value,
 
       if (ada_is_wrapper_field (type, i))
        {
-         struct value *field_val = value_field (value, i);
+         struct value *field_val = ada_value_primitive_field (value, 0,
+                                                              i, type);
          comma_needed =
            print_field_values (field_val, field_val,
                                stream, recurse, options,