re PR fortran/52093 (Extra parenthesis with Size and Shape functions argument cause...

2012-02-03  Tobias Burnus  <burnus@net-b.de>

        PR fortran/52093
        * simplify.c (gfc_simplify_size): Handle INTRINSIC_PARENTHESES.

2012-02-03  Tobias Burnus  <burnus@net-b.de>

        PR fortran/52093
        * gfortran.dg/shape_7.f90: New.

From-SVN: r183877

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f06158d9bd350ca1d9255b0cca7aca156a5d021f..dca2c13349585270c35db3ac041e5740ab4c5626 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-03  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/52093
+       * simplify.c (gfc_simplify_size): Handle INTRINSIC_PARENTHESES.
+
 2012-02-03  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/52012

diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index bb8b575ded8731cf5f3422949a5480ad5f8da166..0780a778e0fa187d38643eb94720199e5e04eb40 100644 (file)
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -5583,6 +5583,7 @@ gfc_simplify_size (gfc_expr *array, gfc_expr *dim, gfc_expr *kind)
          case INTRINSIC_NOT:
          case INTRINSIC_UPLUS:
          case INTRINSIC_UMINUS:
+         case INTRINSIC_PARENTHESES:
            replacement = array->value.op.op1;
            break;
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 517b3d5c76b6a7a05dcf851bad919fca06c7d059..fe4f9c6eab0ab04422156d3aa58c0afcb5aae114 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-03  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/52093
+       * gfortran.dg/shape_7.f90: New.
+
 2012-02-03  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/52012

diff --git a/gcc/testsuite/gfortran.dg/shape_7.f90 b/gcc/testsuite/gfortran.dg/shape_7.f90
new file mode 100644 (file)
index 0000000..3c471f4
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/shape_7.f90
@@ -0,0 +1,32 @@
+! { dg-do compile }
+! { dg-options "-fdump-tree-original" }
+!
+! PR fortran/52093
+!
+! Contributed by Mohammad Rahmani
+!
+
+Program Main
+ Implicit None
+ Integer:: X(2,2)
+ Integer:: X2(7:11,8:9)
+
+ if (size((X)) /= 4) call abort ()
+ if (any (Shape((X))  /= [2,2])) call abort ()
+ if (any (lbound((X)) /= [1,1])) call abort ()
+ if (any (ubound((X)) /= [2,2])) call abort ()
+
+ if (size(X2) /= 10) call abort ()
+ if (any (Shape(X2)  /= [5,2])) call abort ()
+ if (any (lbound(X2) /= [7,8]))  call abort ()
+ if (any (ubound(X2) /= [11,9])) call abort ()
+
+ if (size((X2)) /= 10) call abort ()
+ if (any (Shape((X2))  /= [5,2])) call abort ()
+ if (any (lbound((X2)) /= [1,1])) call abort ()
+ if (any (ubound((X2)) /= [5,2])) call abort ()
+End Program Main
+
+! { dg-final { scan-tree-dump-times "abort" 0 "original" } }
+! { dg-final { cleanup-tree-dump "original" } }
+