diff options
| author | Tobias Burnus <tburnus@baylibre.com> | 2024-05-20 08:34:48 +0200 |
|---|---|---|
| committer | Tobias Burnus <tburnus@baylibre.com> | 2024-05-20 08:34:48 +0200 |
| commit | b701306a9b38bd74cdc26c7ece5add22f2203b56 (patch) | |
| tree | c3173aad4e44c52a0dbf80489acde1ac6effbb40 /gcc | |
| parent | 544d5dcc9150c0ea278fba79ea515f5a87732ce7 (diff) | |
| download | gcc-b701306a9b38bd74cdc26c7ece5add22f2203b56.zip gcc-b701306a9b38bd74cdc26c7ece5add22f2203b56.tar.gz gcc-b701306a9b38bd74cdc26c7ece5add22f2203b56.tar.bz2 | |
Fortran: Fix SHAPE for zero-size arrays
PR fortran/115150
gcc/fortran/ChangeLog:
* trans-intrinsic.cc (gfc_conv_intrinsic_bound): Fix SHAPE
for zero-size arrays
gcc/testsuite/ChangeLog:
* gfortran.dg/shape_12.f90: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/trans-intrinsic.cc | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/shape_12.f90 | 51 |
2 files changed, 54 insertions, 1 deletions
diff --git a/gcc/fortran/trans-intrinsic.cc b/gcc/fortran/trans-intrinsic.cc index 80dc342..912c100 100644 --- a/gcc/fortran/trans-intrinsic.cc +++ b/gcc/fortran/trans-intrinsic.cc @@ -3090,7 +3090,9 @@ gfc_conv_intrinsic_bound (gfc_se * se, gfc_expr * expr, enum gfc_isym_id op) lbound, gfc_index_one_node); } else if (op == GFC_ISYM_SHAPE) - se->expr = size; + se->expr = fold_build2_loc (input_location, MAX_EXPR, + gfc_array_index_type, size, + gfc_index_zero_node); else gcc_unreachable (); diff --git a/gcc/testsuite/gfortran.dg/shape_12.f90 b/gcc/testsuite/gfortran.dg/shape_12.f90 new file mode 100644 index 0000000..e672e1f --- /dev/null +++ b/gcc/testsuite/gfortran.dg/shape_12.f90 @@ -0,0 +1,51 @@ +! { dg-do run } +! +! PR fortran/115150 +! +! Check that SHAPE handles zero-sized arrays correctly +! +implicit none +call one +call two + +contains + +subroutine one + real,allocatable :: A(:),B(:,:) + allocate(a(3:0), b(5:1, 2:5)) + + if (any (shape(a) /= [0])) stop 1 + if (any (shape(b) /= [0, 4])) stop 2 + if (size(a) /= 0) stop 3 + if (size(b) /= 0) stop 4 + if (any (lbound(a) /= [1])) stop 5 + if (any (lbound(b) /= [1, 2])) stop 6 + if (any (ubound(a) /= [0])) stop 5 + if (any (ubound(b) /= [0,5])) stop 6 +end + +subroutine two +integer :: x1(10), x2(10,10) +call f(x1, x2, -3) +end + +subroutine f(y1, y2, n) + integer, value :: n + integer :: y1(1:n) + integer :: y2(1:n,4,2:*) + call g(y1, y2) +end + +subroutine g(z1, z2) + integer :: z1(..), z2(..) + + if (any (shape(z1) /= [0])) stop 1 + if (any (shape(z2) /= [0, 4, -1])) stop 2 + if (size(z1) /= 0) stop 3 + if (size(z2) /= 0) stop 4 + if (any (lbound(z1) /= [1])) stop 5 + if (any (lbound(z2) /= [1, 1, 1])) stop 6 + if (any (ubound(z1) /= [0])) stop 5 + if (any (ubound(z2) /= [0, 4, -1])) stop 6 +end +end |