OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bugs in 'val and 'pos with range types 

In Ada, the 'val and 'pos attributes can be used to map from an
enumeration constant to its position in the enum and vice versa.
These operators did not work properly when the type in question was a
subrange of an enum type with "holes".

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

	* ada-lang.c (value_val_atr): Handle TYPE_CODE_RANGE.
	* gdbtypes.c (discrete_position): Handle TYPE_CODE_RANGE.

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

	* gdb.ada/arr_acc_idx_w_gap.exp: Add enum subrange tests.
	* gdb.ada/arr_acc_idx_w_gap/enum_with_gap.ads (Enum_Subrange): New
	type.
	* gdb.ada/arr_acc_idx_w_gap/enum_with_gap_main.adb (V): New
	variable.
This commit is contained in:
Tom Tromey 2020-05-26 14:11:08 -06:00
parent 0db49895f3
commit 0bc2354b81
7 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2020-05-26 Tom Tromey <tromey@adacore.com>
* ada-lang.c (value_val_atr): Handle TYPE_CODE_RANGE.
* gdbtypes.c (discrete_position): Handle TYPE_CODE_RANGE.
2020-05-25 Cristiano De Alti <cristiano_dealti@hotmail.com>
PR gdb/13519

3
gdb/ada-lang.c
View File

@ -9148,6 +9148,9 @@ value_val_atr (struct type *type, struct value *arg)
if (!integer_type_p (value_type (arg)))
error (_("'VAL requires integral argument"));
if (type->code () == TYPE_CODE_RANGE)
type = TYPE_TARGET_TYPE (type);
if (type->code () == TYPE_CODE_ENUM)
{
long pos = value_as_long (arg);

3
gdb/gdbtypes.c
View File

@ -1155,6 +1155,9 @@ get_array_bounds (struct type *type, LONGEST *low_bound, LONGEST *high_bound)
int
discrete_position (struct type *type, LONGEST val, LONGEST *pos)
{
if (type->code () == TYPE_CODE_RANGE)
type = TYPE_TARGET_TYPE (type);
if (type->code () == TYPE_CODE_ENUM)
{
int i;

8
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,11 @@
2020-05-26 Tom Tromey <tromey@adacore.com>
* gdb.ada/arr_acc_idx_w_gap.exp: Add enum subrange tests.
* gdb.ada/arr_acc_idx_w_gap/enum_with_gap.ads (Enum_Subrange): New
type.
* gdb.ada/arr_acc_idx_w_gap/enum_with_gap_main.adb (V): New
variable.
2020-05-26 Christian Biesinger <cbiesinger@google.com>
* Makefile.in: Use = instead of == for the test command

4
gdb/testsuite/gdb.ada/arr_acc_idx_w_gap.exp
View File

@ -53,3 +53,7 @@ gdb_test "print indexed_by_enum(lit2..lit4)" \
" = \\(lit2 => 43, 42, 41\\)"
gdb_test "print s(2..4)" \
" = \"ell\""
gdb_test "print v" " = lit3"
gdb_test "print enum_subrange'pos(v)" " = 3"
gdb_test "print enum_subrange'val(3)" " = lit3"

6
gdb/testsuite/gdb.ada/arr_acc_idx_w_gap/enum_with_gap.ads
View File

@ -34,14 +34,16 @@ package Enum_With_Gap is
);
for Enum_With_Gaps'size use 16;
type Enum_Subrange is new Enum_With_Gaps range Lit1 .. Lit3;
type MyWord is range 0 .. 16#FFFF# ;
for MyWord'Size use 16;
type AR is array (Enum_With_Gaps range <>) of MyWord;
type AR_Access is access AR;
type String_Access is access String;
procedure Do_Nothing (E : AR_Access);
procedure Do_Nothing (E : String_Access);

1
gdb/testsuite/gdb.ada/arr_acc_idx_w_gap/enum_with_gap_main.adb
View File

@ -19,6 +19,7 @@ procedure Enum_With_Gap_Main is
Indexed_By_Enum : AR_Access :=
new AR'(LIT1 => 1, LIT2 => 43, LIT3 => 42, LIT4 => 41);
S : String_Access := new String'("Hello!");
V : Enum_Subrange := LIT3;
begin
Do_Nothing (Indexed_By_Enum); -- BREAK
Do_Nothing (S);