diff options
| author | Xavier Roirand <roirand@adacore.com> | 2018-09-10 10:30:50 -0500 |
|---|---|---|
| committer | Joel Brobecker <brobecker@adacore.com> | 2018-09-10 11:30:50 -0400 |
| commit | 2963898f38dab323a9e381d7c41a26b9c3498882 (patch) | |
| tree | f2a7149b0fcf4ddb831705fe31e3f206dc002e57 /gdb/ada-varobj.c | |
| parent | 849cba3b83f8b808521ef5b1aaa8fb33c04bd9fa (diff) | |
| download | fsf-binutils-gdb-2963898f38dab323a9e381d7c41a26b9c3498882.zip fsf-binutils-gdb-2963898f38dab323a9e381d7c41a26b9c3498882.tar.gz fsf-binutils-gdb-2963898f38dab323a9e381d7c41a26b9c3498882.tar.bz2 | |
(Ada) Fix -var-list-children MI command for union type
Using this Ada code:
type Union_Type (A : Boolean := False) is record
case A is
when True => B : Integer;
when False => C : Float;
end case;
end record;
pragma Unchecked_Union (Union_Type);
Ut : Union_Type := (A => True, B => 3);
In GDB/MI mode, once creating a varobj from variable "Ut" as follow:
(gdb) -var-create var1 * ut
^done,name="var1",numchild="2",value="{...}",type="foo.union_type",thread-id="1",has_more="0"
Printing the list of its children displays:
(gdb) -var-list-children 1 var1
^error,msg="Duplicate variable object name"
Whereas it should be
(gdb) -var-list-children 1 var1
^done,numchild="2",children=[child={name="var1.b",exp="b",numchild="0",value="3",type="integer",thread-id="1"},child={name="var1.c",exp="c",numchild="0",value="4.20389539e-45",type="float",thread-id="1"}],has_more="0"
The problem occurs because ada_varobj_describe_struct_child wasn't
handling unions. This patch fixes this.
gdb/ChangeLog:
* ada-varobj.c (ada_varobj_describe_struct_child)
(ada_varobj_describe_child): Handle union case like struct one.
testsuite/ChangeLog
* gdb.ada/mi_var_union.exp: New testcase.
* gdb.ada/mi_var_union/bar.adb: New file.
* gdb.ada/mi_var_union/pck.adb: New file.
* gdb.ada/mi_var_union/pck.asd: New file.
Tested on x86_64-linux.
Diffstat (limited to 'gdb/ada-varobj.c')
| -rw-r--r-- | gdb/ada-varobj.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gdb/ada-varobj.c b/gdb/ada-varobj.c index 6dafe47..5baefd9 100644 --- a/gdb/ada-varobj.c +++ b/gdb/ada-varobj.c @@ -419,7 +419,8 @@ ada_varobj_describe_struct_child (struct value *parent_value, int fieldno; int childno = 0; - gdb_assert (TYPE_CODE (parent_type) == TYPE_CODE_STRUCT); + gdb_assert (TYPE_CODE (parent_type) == TYPE_CODE_STRUCT + || TYPE_CODE (parent_type) == TYPE_CODE_UNION); for (fieldno = 0; fieldno < TYPE_NFIELDS (parent_type); fieldno++) { @@ -699,7 +700,8 @@ ada_varobj_describe_child (struct value *parent_value, return; } - if (TYPE_CODE (parent_type) == TYPE_CODE_STRUCT) + if (TYPE_CODE (parent_type) == TYPE_CODE_STRUCT + || TYPE_CODE (parent_type) == TYPE_CODE_UNION) { ada_varobj_describe_struct_child (parent_value, parent_type, parent_name, parent_path_expr, |