FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[gdb/exp] Fix assert when adding ptr to imaginary unit

Browse source 
I'm running into this assertion failure:
...
$ gdb -batch -ex "p (void *)0 - 5i"
gdbtypes.c:3430: internal-error: \
  type* init_complex_type(const char*,   type*): Assertion \
  `target_type->code () == TYPE_CODE_INT \
   || target_type->code () == TYPE_CODE_FLT' failed.
A problem internal to GDB has been detected,
further debugging may prove unreliable.
...

This is a regression since commit c34e871466 "Implement complex arithmetic".
Before that commit we had:
...
(gdb) p (void *)0 - 5i
Argument to arithmetic operation not a number or boolean.
...

Fix this in complex_binop by throwing an error, such that we have:
...
(gdb) print (void *)0 - 5i
Argument to complex arithmetic operation not supported.
...

Tested on x86_64-linux.

gdb/ChangeLog:

2021-02-05  Tom de Vries  <tdevries@suse.de>

	PR exp/27265
	* valarith.c (complex_binop): Throw an error if complex type can't
	be created.

gdb/testsuite/ChangeLog:

2021-02-05  Tom de Vries  <tdevries@suse.de>

	PR exp/27265
	* gdb.base/complex-parts.exp: Add tests.
This commit is contained in:
Tom de Vries 2021-02-05 10:56:39 +01:00
parent d3b54e63f4
commit ae71049661
6 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gdb/gdbtypes.c
View file

@ -3413,6 +3413,15 @@ init_decfloat_type (struct objfile *objfile, int bit, const char *name)
return t;
}
/* Return true if init_complex_type can be called with TARGET_TYPE. */
bool
can_create_complex_type (struct type *target_type)
{
return (target_type->code () == TYPE_CODE_INT
|| target_type->code () == TYPE_CODE_FLT);
}
/* Allocate a TYPE_CODE_COMPLEX type structure. NAME is the type
name. TARGET_TYPE is the component type. */
@ -3421,8 +3430,7 @@ init_complex_type (const char *name, struct type *target_type)
{
struct type *t;
gdb_assert (target_type->code () == TYPE_CODE_INT
|| target_type->code () == TYPE_CODE_FLT);
gdb_assert (can_create_complex_type (target_type));
if (TYPE_MAIN_TYPE (target_type)->flds_bnds.complex_type == nullptr)
{