* ada-lang.c (possible_user_operator_p): Alternative fix to last

checkin guarding against NULL.
This commit is contained in:
Joel Brobecker 2007-08-15 18:36:37 +00:00
parent d10e7fcce7
commit ee90b9ab36
2 changed files with 7 additions and 8 deletions

View File

@ -1,3 +1,9 @@
2007-08-15 Paul Hilfinger <hilfinger@adacore.com>
Joel Brobecker <brobecker@adacore.com>
* ada-lang.c (possible_user_operator_p): Alternative fix to last
checkin guarding against NULL.
2007-08-14 Michael Snyder <msnyder@access-company.com>
* tui-command.c, tui-data.c, tui-disasm.c, tui-file.c, tui-io.c,

View File

@ -3532,14 +3532,7 @@ possible_user_operator_p (enum exp_opcode op, struct value *args[])
return (!(scalar_type_p (type0) && scalar_type_p (type1)));
case BINOP_CONCAT:
return
((TYPE_CODE (type0) != TYPE_CODE_ARRAY
&& (TYPE_CODE (type0) != TYPE_CODE_PTR
|| TYPE_CODE (TYPE_TARGET_TYPE (type0)) != TYPE_CODE_ARRAY))
|| (type1 != NULL && TYPE_CODE (type1) != TYPE_CODE_ARRAY
&& (TYPE_CODE (type1) != TYPE_CODE_PTR
|| (TYPE_CODE (TYPE_TARGET_TYPE (type1))
!= TYPE_CODE_ARRAY))));
return !ada_is_array_type (type0) || !ada_is_array_type (type1);
case BINOP_EXP:
return (!(numeric_type_p (type0) && integer_type_p (type1)));