[multiple changes]

2008-01-28  Tobias Burnus  <burnus@net-b.de>

    PR libfortran/34980
    * simplify.c (gfc_simplify_shape): Simplify rank zero arrays.


2008-01-28  Thomas Koenig  <tkoenig@gcc.gnu.org>

    PR libfortran/34980
    * gfortran.dg/shape_3.f90:  New test.

From-SVN: r131913

gcc/fortran/ChangeLog

+2008-01-28  Tobias Burnus  <burnus@net-b.de>
+
+	PR libfortran/34980
+	* simplify.c (gfc_simplify_shape): Simplify rank zero arrays.
+
 2008-01-27  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR fortran/34990

gcc/fortran/simplify.c

@@ -3714,7 +3714,11 @@ gfc_simplify_shape (gfc_expr *source)
   int n;
   try t;
 
-  if (source->rank == 0 || source->expr_type != EXPR_VARIABLE)
+  if (source->rank == 0)
+    return gfc_start_constructor (BT_INTEGER, gfc_default_integer_kind,
+				  &source->where);
+
+  if (source->expr_type != EXPR_VARIABLE)
     return NULL;
 
   result = gfc_start_constructor (BT_INTEGER, gfc_default_integer_kind,

gcc/testsuite/ChangeLog

+2008-01-28  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR libfortran/34980
+	* gfortran.dg/shape_3.f90:  New test.
+
 2008-01-28  Andreas Krebbel  <krebbel1@de.ibm.com>
 
 	* gcc.target/s390/20020926-1.c: Remove -m31.

gcc/testsuite/gfortran.dg/shape_3.f90

+! { dg-do run }
+! PR 34980 - we got a segfault for calling shape
+!            with a scalar.
+program main
+ integer :: n
+ n = 5
+ open(10,status="scratch")
+ write (10,*) shape(n)
+ close(10,status="delete")
+end
+