diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2016-08-25 19:35:46 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2016-08-25 19:35:46 +0000 |
| commit | e5cf162909e9209d20f3c33fc946d7f412f38028 (patch) | |
| tree | 5ffb23da2ec76df0438906ebb898db781a219154 /gcc | |
| parent | 384043e89efc6f0898b3bab3a758c3b55d3f2bcb (diff) | |
| download | gcc-e5cf162909e9209d20f3c33fc946d7f412f38028.zip gcc-e5cf162909e9209d20f3c33fc946d7f412f38028.tar.gz gcc-e5cf162909e9209d20f3c33fc946d7f412f38028.tar.bz2 | |
re PR fortran/77351 (ICE in remove_trim, at frontend-passes.c:1145)
2016-08-25 Steven g. Kargl <kargl@gcc.gnu.org>
PR fortran/77351
* frontend-passes.c (remove_trim,combine_array_constructor): Check for
NULL pointer.
2016-08-25 Steven g. Kargl <kargl@gcc.gnu.org>
PR fortran/77351
* gfortran.dg/pr77351.f90: New test.
From-SVN: r239763
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/frontend-passes.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr77351.f90 | 6 |
4 files changed, 22 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 93eb48a..6def5b4 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2016-08-25 Steven g. Kargl <kargl@gcc.gnu.org> + + PR fortran/77351 + * frontend-passes.c (remove_trim,combine_array_constructor): Check for + NULL pointer. + 2016-08-24 Paul Thomas <pault@gcc.gnu.org> PR fortran/77358 diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index 3892069..c138f4d 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -1137,6 +1137,8 @@ remove_trim (gfc_expr *rhs) bool ret; ret = false; + if (!rhs) + return ret; /* Check for a // b // trim(c). Looping is probably not necessary because the parser usually generates @@ -1274,6 +1276,9 @@ combine_array_constructor (gfc_expr *e) op1 = e->value.op.op1; op2 = e->value.op.op2; + if (!op1 || !op2) + return false; + if (op1->expr_type == EXPR_ARRAY && op2->rank == 0) scalar_first = false; else if (op2->expr_type == EXPR_ARRAY && op1->rank == 0) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index caeaa7e..c39e191 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-08-25 Steven g. Kargl <kargl@gcc.gnu.org> + + PR fortran/77351 + * gfortran.dg/pr77351.f90: New test. + 2016-08-25 Marek Polacek <polacek@redhat.com> * c-c++-common/Wlogical-not-parentheses-2.c: New test. diff --git a/gcc/testsuite/gfortran.dg/pr77351.f90 b/gcc/testsuite/gfortran.dg/pr77351.f90 new file mode 100644 index 0000000..76ce5c5 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr77351.f90 @@ -0,0 +1,6 @@ +! { dg-do compile } +program p + integer :: z(4) = [1, 2, 3, 4] + print *, any(shape(z) /= [4,1]) ! { dg-error "shape for elemental binary" } +end +! { dg-excess-errors "operands are incommensurate" } |