diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2016-09-25 18:46:28 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2016-09-25 18:46:28 +0000 |
| commit | 9b597c1f414566f7bebed6bd88675a8c022a07e2 (patch) | |
| tree | 7c4b3198481629687fd5049b0e11e10d0ebb96e9 | |
| parent | f1c7e7f10fe8b4ad6dbfb2a93c850d52693a6331 (diff) | |
| download | gcc-9b597c1f414566f7bebed6bd88675a8c022a07e2.zip gcc-9b597c1f414566f7bebed6bd88675a8c022a07e2.tar.gz gcc-9b597c1f414566f7bebed6bd88675a8c022a07e2.tar.bz2 | |
re PR fortran/77429 (ICE in gfc_check_dependency, at fortran/dependency.c:1261)
2016-09-25 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/77429
* dependency.c (gfc_check_dependency): Convert gcc_assert() to
a conditional and possible call to gfc_internal_error().
2016-09-25 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/77429
* gfortran.dg/pr77429.f90: New test.
From-SVN: r240477
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/dependency.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr77429.f90 | 7 |
4 files changed, 20 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 96867e3..5675e03 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2016-09-25 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/77429 + * dependency.c (gfc_check_dependency): Convert gcc_assert() to + a conditional and possible call to gfc_internal_error(). + +2016-09-25 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/77694 * frontend-passes.c (optimize_binop_array_assignment): Check pointer for NULL. diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c index 58a443b..12e5d13 100644 --- a/gcc/fortran/dependency.c +++ b/gcc/fortran/dependency.c @@ -1258,7 +1258,8 @@ gfc_check_dependency (gfc_expr *expr1, gfc_expr *expr2, bool identical) && strcmp (expr1->value.function.name, "_F.caf_get") == 0) return 0; - gcc_assert (expr1->expr_type == EXPR_VARIABLE); + if (expr1->expr_type != EXPR_VARIABLE) + gfc_internal_error ("gfc_check_dependency: expecting an EXPR_VARIABLE"); switch (expr2->expr_type) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5f7435e..45e5307 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2016-09-25 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/77429 + * gfortran.dg/pr77429.f90: New test. + +2016-09-25 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/77694 * gfortran.dg/pr77694.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/pr77429.f90 b/gcc/testsuite/gfortran.dg/pr77429.f90 new file mode 100644 index 0000000..0f90237 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr77429.f90 @@ -0,0 +1,7 @@ +! { dg-do compile } +program p + shape(1) = 0 ! { dg-error "expression in variable definition context" } + shape(1,2) = 0 ! { dg-error "expression in variable definition context" } + shape(1,2,3) = 0 ! { dg-error "Too many arguments in call" } + lbound([1]) = 0 ! { dg-error "expression in variable definition context" } +end |