aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/array.c
diff options
context:
space:
mode:
authorDaniel Kraft <d@domob.eu>2010-07-29 11:06:53 +0200
committerDaniel Kraft <domob@gcc.gnu.org>2010-07-29 11:06:53 +0200
commit2b868bf548107e361f31285b2dc2961194478072 (patch)
treee9e7a5c29a070c17c7a37c78e616f304852df4c3 /gcc/fortran/array.c
parent61869cc95e834cc533818a381f84c09c0e295829 (diff)
downloadgcc-2b868bf548107e361f31285b2dc2961194478072.zip
gcc-2b868bf548107e361f31285b2dc2961194478072.tar.gz
gcc-2b868bf548107e361f31285b2dc2961194478072.tar.bz2
re PR fortran/45117 (Segfault in resolve_array_bound)
2010-07-29 Daniel Kraft <d@domob.eu> PR fortran/45117 * array.c (resolve_array_bound): Fix error message to properly handle non-variable expressions. From-SVN: r162670
Diffstat (limited to 'gcc/fortran/array.c')
-rw-r--r--gcc/fortran/array.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 68b6456..e45f7e4 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -300,10 +300,14 @@ resolve_array_bound (gfc_expr *e, int check_constant)
|| gfc_specification_expr (e) == FAILURE)
return FAILURE;
- if (check_constant && gfc_is_constant_expr (e) == 0)
+ if (check_constant && !gfc_is_constant_expr (e))
{
- gfc_error ("Variable '%s' at %L in this context must be constant",
- e->symtree->n.sym->name, &e->where);
+ if (e->expr_type == EXPR_VARIABLE)
+ gfc_error ("Variable '%s' at %L in this context must be constant",
+ e->symtree->n.sym->name, &e->where);
+ else
+ gfc_error ("Expression at %L in this context must be constant",
+ &e->where);
return FAILURE;
}