diff options
| author | Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2014-06-19 11:58:55 +0000 |
|---|---|---|
| committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2014-06-19 11:58:55 +0000 |
| commit | c8d599e1ddb1947d5c4c48a8c9aa45c52d9159a8 (patch) | |
| tree | ae0fd06ff7bd79060722bf9fe934fcf47a945187 /gcc | |
| parent | c7744b8eeae40c5979d079370b856ceb6b05f997 (diff) | |
| download | gcc-c8d599e1ddb1947d5c4c48a8c9aa45c52d9159a8.zip gcc-c8d599e1ddb1947d5c4c48a8c9aa45c52d9159a8.tar.gz gcc-c8d599e1ddb1947d5c4c48a8c9aa45c52d9159a8.tar.bz2 | |
re PR fortran/61454 (ICE in simplification of initialization expression with array)
PR fortran/61454
* expr.c (scalarize_intrinsic_call): Take care of optional
arguments.
* gfortran.dg/pr61454.f90: New file.
From-SVN: r211822
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr61454.f90 | 14 |
4 files changed, 26 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 903e9ab..6325c50 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2014-06-19 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> + + PR fortran/61454 + * expr.c (scalarize_intrinsic_call): Take care of optional + arguments. + 2014-06-19 Tobias Burnus <burnus@net-b.de> * trans-intrinsic.c (conv_co_minmaxsum): Fix argument diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index f677204..f0238c1 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -1955,7 +1955,7 @@ scalarize_intrinsic_call (gfc_expr *e) for (; a; a = a->next) { n++; - if (a->expr->expr_type != EXPR_ARRAY) + if (!a->expr || a->expr->expr_type != EXPR_ARRAY) continue; array_arg = n; expr = gfc_copy_expr (a->expr); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5138e5a..5d58712 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-06-19 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> + + PR fortran/61454 + * gfortran.dg/pr61454.f90: New file. + 2014-06-19 Terry Guo <terry.guo@arm.com> * gcc.target/arm/thumb1-load-64bit-constant-1.c: New test. diff --git a/gcc/testsuite/gfortran.dg/pr61454.f90 b/gcc/testsuite/gfortran.dg/pr61454.f90 new file mode 100644 index 0000000..75e4572 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr61454.f90 @@ -0,0 +1,14 @@ +! { dg-do compile } + + implicit none + integer, parameter :: arr(2) = [ 1, 3 ] + real, parameter :: arr2(2) = [ 1.5, 2.1 ] + integer, parameter :: j = int(sum(arr)) + integer, parameter :: k = ceiling(sum(arr2)) + real(kind=j) :: x1 + real(kind=k) :: x2 + + print *, j, k + print *, x1, x2 + + end |