From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 14 Mar 2007 12:16:24 +0000 (+0000)
Subject: 	* module.c (mio_typespec): Don't look at ts->cl if not BT_CHARACTER.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e29979ad586cb58d777fc15bed1eba7b39909eca;p=thirdparty%2Fgcc.git

	* module.c (mio_typespec): Don't look at ts->cl if not BT_CHARACTER.

	* gfortran.dg/module_implicit_conversion.f90: New test.


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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 2a49aa66846e..832f62ca8fcc 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* module.c (mio_typespec): Don't look at ts->cl if not BT_CHARACTER.
+
 2007-03-13  Brooks Moses  <brooks.moses@codesourcery.com>
 
 	PR fortran/30933
diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c
index 5b8bd550f9a3..af52ca9942e0 100644
--- a/gcc/fortran/module.c
+++ b/gcc/fortran/module.c
@@ -1814,7 +1814,14 @@ mio_typespec (gfc_typespec *ts)
   else
     mio_symbol_ref (&ts->derived);
 
-  mio_charlen (&ts->cl);
+  if (ts->type != BT_CHARACTER)
+    {
+      /* ts->cl is only valid for BT_CHARACTER.  */
+      mio_lparen ();
+      mio_rparen ();
+    }
+  else
+    mio_charlen (&ts->cl);
 
   mio_rparen ();
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3007d98f41e0..d3713ed19ec9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* gfortran.dg/module_implicit_conversion.f90: New test.
+
 2007-03-13  Alexandre Oliva  <aoliva@redhat.com>
 
 	PR middle-end/31127
diff --git a/gcc/testsuite/gfortran.dg/module_implicit_conversion.f90 b/gcc/testsuite/gfortran.dg/module_implicit_conversion.f90
new file mode 100644
index 000000000000..d7835a7f9613
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/module_implicit_conversion.f90
@@ -0,0 +1,9 @@
+! { dg-do compile }
+! { dg-options "-std=gnu" }
+
+module module_implicit_conversion
+  ! double complex :: s = (1.0D0, 0D0) 
+  double complex :: s = (1.0, 0D0)
+end module module_implicit_conversion
+
+! { dg-final { cleanup-modules "module_implicit_conversion" } }