aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2021-02-05 10:56:39 +0100
committerTom de Vries <tdevries@suse.de>2021-02-05 10:56:39 +0100
commitae7104966177c7bcb7bef9e1445489d9d2f97f06 (patch)
tree0db06bfbce6489d5145e0433da37b037cf15f451
parentd3b54e63f4866551953a03f512049741b0e776c4 (diff)
downloadgdb-ae7104966177c7bcb7bef9e1445489d9d2f97f06.zip
gdb-ae7104966177c7bcb7bef9e1445489d9d2f97f06.tar.gz
gdb-ae7104966177c7bcb7bef9e1445489d9d2f97f06.tar.bz2
[gdb/exp] Fix assert when adding ptr to imaginary unit
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 c34e8714662 "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.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/gdbtypes.c12
-rw-r--r--gdb/gdbtypes.h1
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.base/complex-parts.exp11
-rw-r--r--gdb/valarith.c3
6 files changed, 36 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 94b5c7a..07fe6a0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
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.
+
+2021-02-05 Tom de Vries <tdevries@suse.de>
+
PR symtab/27307
* dwarf2/read.c (create_cus_from_debug_names_list): Add missing
return.
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 4dd1a6a..c736dff 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -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)
{
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 40b1aed..45014a2 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -2289,6 +2289,7 @@ extern struct type *init_float_type (struct objfile *, int, const char *,
const struct floatformat **,
enum bfd_endian = BFD_ENDIAN_UNKNOWN);
extern struct type *init_decfloat_type (struct objfile *, int, const char *);
+extern bool can_create_complex_type (struct type *);
extern struct type *init_complex_type (const char *, struct type *);
extern struct type *init_pointer_type (struct objfile *, int, const char *,
struct type *);
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 01539a6..9c24a49 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2021-02-05 Tom de Vries <tdevries@suse.de>
+ PR exp/27265
+ * gdb.base/complex-parts.exp: Add tests.
+
+2021-02-05 Tom de Vries <tdevries@suse.de>
+
PR symtab/27307
* gdb.dwarf2/clang-debug-names.exp: Check file command warnings.
diff --git a/gdb/testsuite/gdb.base/complex-parts.exp b/gdb/testsuite/gdb.base/complex-parts.exp
index 3677c05..6385752 100644
--- a/gdb/testsuite/gdb.base/complex-parts.exp
+++ b/gdb/testsuite/gdb.base/complex-parts.exp
@@ -103,3 +103,14 @@ gdb_test "print (_Complex int) 4" " = 4 \\+ 0i"
gdb_test "print (_Complex float) 4.5" " = 4.5 \\+ 0i"
gdb_test "ptype __complex__ short" " = _Complex short"
gdb_test "print (_Complex int) (23.75 + 8.88i)" " = 23 \\+ 8i"
+
+set re_reject_arg "Argument to complex arithmetic operation not supported\\."
+gdb_test "print (void *)0 + 5i" $re_reject_arg
+gdb_test "print (_Decimal32)0 + 5i" $re_reject_arg
+
+# Set language to c++. Avoid warning by not having current frame.
+clean_restart
+gdb_test_no_output "set language c++"
+
+# C++ type tests.
+gdb_test "print (bool)1 + 1i" " = 1 \\+ 1i"
diff --git a/gdb/valarith.c b/gdb/valarith.c
index 3150309..299a99f 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -1076,6 +1076,9 @@ complex_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
struct type *comp_type = promotion_type (value_type (arg1_real),
value_type (arg2_real));
+ if (!can_create_complex_type (comp_type))
+ error (_("Argument to complex arithmetic operation not supported."));
+
arg1_real = value_cast (comp_type, arg1_real);
arg1_imag = value_cast (comp_type, arg1_imag);
arg2_real = value_cast (comp_type, arg2_real);