From d36430db79dc8eccb9cb188e1234f7ff044f79b4 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Wed, 20 Aug 2014 14:50:38 +0200 Subject: [PATCH] Fix handling of typedefs to types having a data_location attribute. Consider an array described in the debugging information as being a typedef of an array type for which there is a DW_AT_data_location attribute. Trying to print the value of that array currently yields incorrect element values. For instance: (gdb) print foo.three_tdef $1 = (6293760, 0, 6293772) The problem occurs because we check for the data_location attribute only on the typedef type, whereas we should be checking for the typedef's target type. As a result, GDB erroneously thinks that there is no data_location, and therefore starts reading the array's content from the address of the descriptor instead of the data_location address. gdb/ChangeLog: * value.c (value_from_contents_and_address): Strip resolved_type's typedef layers before checking its TYPE_DATA_LOCATION. gdb/testsuite/ChangeLog: * gdb.dwarf2/data-loc.exp: Add additional tests exercising the handling of variables declared as a typedef to an array which a DW_AT_data_location attribute. --- gdb/ChangeLog | 5 ++ gdb/testsuite/ChangeLog | 6 ++ gdb/testsuite/gdb.dwarf2/data-loc.exp | 105 +++++++++++++++++++++++++- gdb/value.c | 7 +- 4 files changed, 118 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c0b4f82b04c..8c6b2047579 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2014-08-20 Joel Brobecker + + * value.c (value_from_contents_and_address): Strip resolved_type's + typedef layers before checking its TYPE_DATA_LOCATION. + 2014-08-20 Pedro Alves * value.c (value_contents_bits_eq): Initialize l,h for gcc -Wall. diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e7a464468d3..ef024b992a5 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-08-20 Joel Brobecker + + * gdb.dwarf2/data-loc.exp: Add additional tests exercising + the handling of variables declared as a typedef to an array + which a DW_AT_data_location attribute. + 2014-08-19 Andrew Burgess Pedro Alves diff --git a/gdb/testsuite/gdb.dwarf2/data-loc.exp b/gdb/testsuite/gdb.dwarf2/data-loc.exp index b5c5f678aea..81456fa030c 100644 --- a/gdb/testsuite/gdb.dwarf2/data-loc.exp +++ b/gdb/testsuite/gdb.dwarf2/data-loc.exp @@ -42,7 +42,7 @@ Dwarf::assemble $asm_file { {DW_AT_name foo.adb} {DW_AT_comp_dir /tmp} } { - declare_labels integer_label array_label + declare_labels integer_label array_label array_ptr_label integer_label: DW_TAG_base_type { {DW_AT_byte_size 4 DW_FORM_sdata} @@ -76,7 +76,7 @@ Dwarf::assemble $asm_file { } SPECIAL_expr} } } - DW_TAG_typedef { + array_ptr_label: DW_TAG_typedef { {DW_AT_name foo__array_type} {DW_AT_type :$array_label} } @@ -88,6 +88,14 @@ Dwarf::assemble $asm_file { } SPECIAL_expr} {external 1 flag} } + DW_TAG_variable { + {DW_AT_name foo__three_tdef} + {DW_AT_type :$array_ptr_label} + {DW_AT_location { + DW_OP_addr table_1 + } SPECIAL_expr} + {external 1 flag} + } DW_TAG_variable { {DW_AT_name foo__five} {DW_AT_type :$array_label} @@ -96,6 +104,14 @@ Dwarf::assemble $asm_file { } SPECIAL_expr} {external 1 flag} } + DW_TAG_variable { + {DW_AT_name foo__five_tdef} + {DW_AT_type :$array_ptr_label} + {DW_AT_location { + DW_OP_addr table_2 + } SPECIAL_expr} + {external 1 flag} + } } } } @@ -115,6 +131,8 @@ if ![runto_main] { gdb_test_no_output "set language ada" +# foo.three + gdb_test "print foo.three" \ " = \\(1, 2, 3\\)" @@ -139,6 +157,32 @@ gdb_test "print foo.three'last" \ gdb_test "print foo.three'length" \ " = 3" +# foo.three_tdef + +gdb_test "print foo.three_tdef" \ + " = \\(1, 2, 3\\)" + +gdb_test "ptype foo.three_tdef" \ + "type = array \\(1 .. 3\\) of integer" + +gdb_test "print foo.three_tdef(1)" \ + " = 1" + +gdb_test "print foo.three_tdef(2)" \ + " = 2" + +gdb_test "print foo.three_tdef(3)" \ + " = 3" + +gdb_test "print foo.three_tdef'first" \ + " = 1" + +gdb_test "print foo.three_tdef'last" \ + " = 3" + +gdb_test "print foo.three_tdef'length" \ + " = 3" + gdb_test "print foo.five" \ " = \\(2 => 5, 8, 13, 21, 34\\)" @@ -148,6 +192,8 @@ gdb_test "ptype foo.five" \ gdb_test "ptype foo.array_type" \ "type = array \\(<>\\) of integer" +# foo.five + gdb_test "print foo.five(2)" \ " = 5" @@ -172,19 +218,74 @@ gdb_test "print foo.five'last" \ gdb_test "print foo.five'length" \ " = 5" +# foo.five_tdef + +gdb_test "print foo.five_tdef" \ + " = \\(2 => 5, 8, 13, 21, 34\\)" + +gdb_test "ptype foo.five_tdef" \ + "type = array \\(2 .. 6\\) of integer" + +gdb_test "ptype foo.array_type" \ + "type = array \\(<>\\) of integer" + +gdb_test "print foo.five_tdef(2)" \ + " = 5" + +gdb_test "print foo.five_tdef(3)" \ + " = 8" + +gdb_test "print foo.five_tdef(4)" \ + " = 13" + +gdb_test "print foo.five_tdef(5)" \ + " = 21" + +gdb_test "print foo.five_tdef(6)" \ + " = 34" + +gdb_test "print foo.five_tdef'first" \ + " = 2" + +gdb_test "print foo.five_tdef'last" \ + " = 6" + +gdb_test "print foo.five_tdef'length" \ + " = 5" + gdb_test_no_output "set lang c" +# foo__three + gdb_test "print foo__three" \ " = \\{1, 2, 3\\}" gdb_test "ptype foo__three" \ "type = integer \\\[3\\\]" +# foo__three_tdef + +gdb_test "print foo__three_tdef" \ + " = \\{1, 2, 3\\}" + +gdb_test "ptype foo__three_tdef" \ + "type = integer \\\[3\\\]" + +# foo__five + gdb_test "print foo__five" \ " = \\{5, 8, 13, 21, 34\\}" gdb_test "ptype foo__five" \ "type = integer \\\[5\\\]" +# foo__five_tdef + +gdb_test "print foo__five_tdef" \ + " = \\{5, 8, 13, 21, 34\\}" + +gdb_test "ptype foo__five_tdef" \ + "type = integer \\\[5\\\]" + gdb_test "ptype foo__array_type" \ "type = integer \\\[variable length\\\]" diff --git a/gdb/value.c b/gdb/value.c index 09ee1caec4e..077d2345b53 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -3475,15 +3475,16 @@ value_from_contents_and_address (struct type *type, CORE_ADDR address) { struct type *resolved_type = resolve_dynamic_type (type, address); + struct type *resolved_type_no_typedef = check_typedef (resolved_type); struct value *v; if (valaddr == NULL) v = allocate_value_lazy (resolved_type); else v = value_from_contents (resolved_type, valaddr); - if (TYPE_DATA_LOCATION (resolved_type) != NULL - && TYPE_DATA_LOCATION_KIND (resolved_type) == PROP_CONST) - address = TYPE_DATA_LOCATION_ADDR (resolved_type); + if (TYPE_DATA_LOCATION (resolved_type_no_typedef) != NULL + && TYPE_DATA_LOCATION_KIND (resolved_type_no_typedef) == PROP_CONST) + address = TYPE_DATA_LOCATION_ADDR (resolved_type_no_typedef); set_value_address (v, address); VALUE_LVAL (v) = lval_memory; return v; -- 2.30.2