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

        checkin guarding against NULL.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bd452f2fdd3c38ce953eaa3e74828c26c3efdade..73c794b8e85cf232a6cdff3cb33cf9cbbbd60852 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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,

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 4b1e2921fd712069e0b9e2a9b0e428f6a2984e91..7f96dea72b421777cfb34fd71801a7684058aa0e 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -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)));