mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-24 10:35:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash with GNAT minimal encodings

Browse Source 
Running the AdaCore internal test suite with -fgnat-encodings=minimal
found a gdb crash.  The bug is that GDB ends up with a typedef in
ada_index_type, resulting in a NULL dereference.

This crash can be reproduced using GCC 11 with the included test case.

Tested on x86-64 Fedora 32.  Because this is Ada-specific, and was
already reviewed by Joel, I am going to check it in.

2021-04-30  Tom Tromey  <tromey@adacore.com>

	* ada-lang.c (ada_index_type): Use ada_check_typedef.

gdb/testsuite/ChangeLog
2021-04-30  Tom Tromey  <tromey@adacore.com>

	* gdb.ada/enum_idx_packed/pck.ads (My_Enum, My_Array_Type)
	(Confused_Array): New types.
	* gdb.ada/enum_idx_packed/foo.adb (Confused_Array): New variable.
	* gdb.ada/enum_idx_packed.exp: Add new tests.
This commit is contained in:
Tom Tromey 2021-04-15 08:54:06 -06:00
parent d1fbc3ba09
commit 2869ac4b59
6 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -1,3 +1,7 @@
2021-04-30 Tom Tromey <tromey@adacore.com>
* ada-lang.c (ada_index_type): Use ada_check_typedef.
2021-04-29 Simon Marchi <simon.marchi@efficios.com>
* auto-load.h: Split namespace declaration.

7
gdb/ada-lang.c
View File

@ -2877,8 +2877,11 @@ ada_index_type (struct type *type, int n, const char *name)
int i;
for (i = 1; i < n; i += 1)
type = TYPE_TARGET_TYPE (type);
result_type = TYPE_TARGET_TYPE (type->index_type ());
{
type = ada_check_typedef (type);
type = TYPE_TARGET_TYPE (type);
}
result_type = TYPE_TARGET_TYPE (ada_check_typedef (type)->index_type ());
/* FIXME: The stabs type r(0,0);bound;bound in an array type
has a target type of TYPE_CODE_UNDEF. We compensate here, but
perhaps stabsread.c would make more sense. */

7
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2021-04-30 Tom Tromey <tromey@adacore.com>
* gdb.ada/enum_idx_packed/pck.ads (My_Enum, My_Array_Type)
(Confused_Array): New types.
* gdb.ada/enum_idx_packed/foo.adb (Confused_Array): New variable.
* gdb.ada/enum_idx_packed.exp: Add new tests.
2021-04-30 Tom de Vries <tdevries@suse.de>
* gdb.mi/mi-sym-info.exp: Add with_timeout_factor, and increase

3
gdb/testsuite/gdb.ada/enum_idx_packed.exp
View File

@ -122,4 +122,7 @@ foreach_with_prefix scenario {all minimal} {
gdb_test "print multi_access.all" \
" = \\(\\(8, 13, 21, 34, 55\\), \\(1, 1, 2, 3, 5\\)\\)"
gdb_test "print confused_array(red, green)" " = 2"
gdb_test "print confused_array(green, red)" " = 6"
}

4
gdb/testsuite/gdb.ada/enum_idx_packed/foo.adb
View File

@ -26,6 +26,10 @@ procedure Foo is
:= new Multi_Dimension'(True => (1, 1, 2, 3, 5),
False => (8, 13, 21, 34, 55));
Confused_Array : Confused_Array_Type := (Red => (0, 1, 2),
Green => (5, 6, 7),
others => (others => 72));
begin
Do_Nothing (Full'Address); -- STOP
Do_Nothing (Primary'Address);

5
gdb/testsuite/gdb.ada/enum_idx_packed/pck.ads
View File

@ -48,5 +48,10 @@ package Pck is
pragma Pack (Multi_Dimension);
type Multi_Dimension_Access is access all Multi_Dimension;
type My_Enum is (Blue, Red, Green);
type My_Array_Type is array (My_Enum) of Integer;
type Confused_Array_Type is array (Color) of My_Array_Type;
procedure Do_Nothing (A : System.Address);
end Pck;