2009-01-28 Paul Thomas <pault@gcc.gnu.org>

	PR fortran/38852
	PR fortran/39006
	* trans-intrinsic.c (gfc_conv_intrinsic_bound): Use the array
	descriptor ubound for UBOUND, when the array lbound == 1.

2009-01-28  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/38852
	PR fortran/39006
	* gfortran.dg/bound_6.f90: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@143743 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 6facf64..1186064 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-28  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/38852
+       PR fortran/39006
+       * trans-intrinsic.c (gfc_conv_intrinsic_bound): Use the array
+       descriptor ubound for UBOUND, when the array lbound == 1.
+
 2009-01-27  Daniel Kraft  <d@domob.eu>
 
        PR fortran/38883

diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index e3941c5..50b4293 100644 (file)
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -972,12 +972,17 @@ gfc_conv_intrinsic_bound (gfc_se * se, gfc_expr * expr, int upper)
 
       cond4 = fold_build2 (LT_EXPR, boolean_type_node, stride,
                           gfc_index_zero_node);
-      cond4 = fold_build2 (TRUTH_AND_EXPR, boolean_type_node, cond4, cond2);
 
       if (upper)
        {
+         tree cond5;
          cond = fold_build2 (TRUTH_OR_EXPR, boolean_type_node, cond3, cond4);
 
+         cond5 = fold_build2 (EQ_EXPR, boolean_type_node, gfc_index_one_node, lbound);
+         cond5 = fold_build2 (TRUTH_AND_EXPR, boolean_type_node, cond4, cond5);
+
+         cond = fold_build2 (TRUTH_OR_EXPR, boolean_type_node, cond, cond5);
+
          se->expr = fold_build3 (COND_EXPR, gfc_array_index_type, cond,
                                  ubound, gfc_index_zero_node);
        }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 44e685b..06585cd 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-28  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/38852
+       PR fortran/39006
+       * gfortran.dg/bound_6.f90: New test.
+
 2009-01-28  Pat Haugen  <pthaugen@us.ibm.com>
 
        * gcc.target/powerpc/avoid-indexed-addresses.c: New test.

diff --git a/gcc/testsuite/gfortran.dg/bound_6.f90 b/gcc/testsuite/gfortran.dg/bound_6.f90
new file mode 100644 (file)
index 0000000..5e0e3f7
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/bound_6.f90
@@ -0,0 +1,71 @@
+! { dg-do run }\r
+! Test the fix for PR38852 and PR39006 in which LBOUND did not work\r
+! for some arrays with negative strides.\r
+!\r
+! Contributed by Dick Hendrickson  <dick.hendrickson@gmail.com>\r
+!                Clive Page        <clivegpage@googlemail.com>\r
+!            and Mikael Morin      <mikael.morin@tele2.fr>\r
+!\r
+program try_je0031\r
+  integer ida(4)\r
+  real dda(5,5,5,5,5)\r
+  integer, parameter :: nx = 4, ny = 3\r
+  interface\r
+    SUBROUTINE PR38852(IDA,DDA,nf2,nf5,mf2)\r
+      INTEGER IDA(4)\r
+      REAL DDA(5,5,5,5,5)\r
+      TARGET DDA\r
+    END SUBROUTINE\r
+  end interface\r
+  integer :: array1(nx,ny), array2(nx,ny) \r
+  data array2 / 1,2,3,4, 10,20,30,40, 100,200,300,400 /\r
+  array1 = array2\r
+  call PR38852(IDA,DDA,2,5,-2)\r
+  call PR39006(array1, array2(:,ny:1:-1))\r
+  call mikael         ! http://gcc.gnu.org/ml/fortran/2009-01/msg00342.html\r
+contains\r
+  subroutine PR39006(array1, array2)\r
+    integer, intent(in) :: array1(:,:), array2(:,:)\r
+    integer :: j\r
+    do j = 1, ubound(array2,2)\r
+      if (any (array1(:,j) .ne. array2(:,4-j))) call abort\r
+    end do\r
+  end subroutine\r
+end \r
+\r
+SUBROUTINE PR38852(IDA,DDA,nf2,nf5,mf2)\r
+  INTEGER IDA(4)\r
+  REAL DLA(:,:,:,:)\r
+  REAL DDA(5,5,5,5,5)\r
+  POINTER DLA\r
+  TARGET DDA\r
+  DLA => DDA(2:3, 1:3:2, 5:4:-1, NF2, NF5:NF2:MF2)\r
+  IDA = UBOUND(DLA)\r
+  if (any(ida /= 2)) call abort\r
+  DLA => DDA(2:3, 1:3:2, 5:4:-1, 2, 5:2:-2)\r
+  IDA = UBOUND(DLA)\r
+  if (any(ida /= 2)) call abort\r
+!\r
+! These worked.\r
+!\r
+  DLA => DDA(2:3, 1:3:2, 5:4:-1, 2, 5:2:-2)\r
+  IDA = shape(DLA)\r
+  if (any(ida /= 2)) call abort\r
+  DLA => DDA(2:3, 1:3:2, 5:4:-1, 2, 5:2:-2)\r
+  IDA = LBOUND(DLA)\r
+  if (any(ida /= 1)) call abort\r
+END SUBROUTINE\r
+\r
+subroutine mikael\r
+  implicit none\r
+  call test (1,  3, 3)\r
+  call test (2,  3, 3)\r
+  call test (2, -1, 0)\r
+  call test (1, -1, 0)\r
+contains\r
+  subroutine test (a, b, expect)\r
+    integer :: a, b, expect\r
+    integer :: c(a:b)\r
+    if (ubound (c, 1) .ne. expect) call abort\r
+  end subroutine test\r
+end subroutine\r