aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2012-02-02 22:01:34 +0100
committerTobias Burnus <burnus@gcc.gnu.org>2012-02-02 22:01:34 +0100
commit1b3f07c72adadbffcfb035b986414e0a18fdd6a2 (patch)
treee204ee1983ef45d40bb5d4653e5a8bc0cf6e3f0e /gcc
parent1f01c3ecd197dc12ac7ebf05d2567d655496677a (diff)
downloadgcc-1b3f07c72adadbffcfb035b986414e0a18fdd6a2.zip
gcc-1b3f07c72adadbffcfb035b986414e0a18fdd6a2.tar.gz
gcc-1b3f07c72adadbffcfb035b986414e0a18fdd6a2.tar.bz2
re PR fortran/52093 (Extra parenthesis with Size and Shape functions argument cause internal compiler error: Segmentation fault)
2012-02-02 Tobias Burnus <burnus@net-b.de> PR fortran/52093 * simplify.c (gfc_simplify_size): Handle INTRINSIC_PARENTHESES. 2012-02-02 Tobias Burnus <burnus@net-b.de> PR fortran/52093 * gfortran.dg/shape_7.f90: New. From-SVN: r183848
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/simplify.c1
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/shape_7.f9032
4 files changed, 43 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 593d778..7f8cc06 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-02 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/52093
+ * simplify.c (gfc_simplify_size): Handle INTRINSIC_PARENTHESES.
+
2012-02-01 Thomas König <tkoenig@gcc.gnu.org>
PR fortran/51958
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 282d88d..706dab4 100644
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -5541,6 +5541,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 eddd59c..9c0b3b8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-02 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/52093
+ * gfortran.dg/shape_7.f90: New.
+
2012-02-02 Richard Sandiford <rdsandiford@googlemail.com>
* gcc.target/mips/mips-prepend-1.c: New test.
diff --git a/gcc/testsuite/gfortran.dg/shape_7.f90 b/gcc/testsuite/gfortran.dg/shape_7.f90
new file mode 100644
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" } }
+