re PR fortran/38657 (PUBLIC/PRIVATE Common blocks)

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

	PR fortran/38657
	* module.c (write_common_0): Revert patch of 2009-01-10.

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

	PR fortran/38657
	* gfortran.dg/module_commons_3.f90: Remove

From-SVN: r143459

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 6bdcdbf..47f714e 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-17  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/38657
+       * module.c (write_common_0): Revert patch of 2009-01-05.
+
 2009-01-16  Janus Weil  <janus@gcc.gnu.org>
 
        PR fortran/38152

diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c
index 44ad375..3ae5929 100644 (file)
--- a/gcc/fortran/module.c
+++ b/gcc/fortran/module.c
@@ -4337,7 +4337,6 @@ write_common_0 (gfc_symtree *st)
 {
   gfc_common_head *p;
   const char * name;
-  const char * lname;
   int flags;
   const char *label;
   struct written_common *w;
@@ -4350,9 +4349,6 @@ write_common_0 (gfc_symtree *st)
 
   /* We will write out the binding label, or the name if no label given.  */
   name = st->n.common->name;
-
-  /* Use the symtree(local)name to check if the common has been written.  */ 
-  lname = st->name;
   p = st->n.common;
   label = p->is_bind_c ? p->binding_label : p->name;
 
@@ -4360,7 +4356,7 @@ write_common_0 (gfc_symtree *st)
   w = written_commons;
   while (w)
     {
-      int c = strcmp (lname, w->name);
+      int c = strcmp (name, w->name);
       c = (c != 0 ? c : strcmp (label, w->label));
       if (c == 0)
        write_me = false;
@@ -4388,7 +4384,7 @@ write_common_0 (gfc_symtree *st)
 
       /* Record that we have written this common.  */
       w = XCNEW (struct written_common);
-      w->name = lname;
+      w->name = p->name;
       w->label = label;
       gfc_insert_bbt (&written_commons, w, compare_written_commons);
     }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a5ba1e6..fc84ec4 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-17  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/38657
+       * gfortran.dg/module_commons_3.f90: Remove
+
 2009-01-16  H.J. Lu  <hongjiu.lu@intel.com>
 
        * gcc.dg/tree-ssa/foldaddr-1.c: Add the missing '}'.

diff --git a/gcc/testsuite/gfortran.dg/module_commons_3.f90 b/gcc/testsuite/gfortran.dg/module_commons_3.f90
deleted file mode 100644 (file)
index 9ae6386..0000000
--- a/gcc/testsuite/gfortran.dg/module_commons_3.f90
+++ /dev/null
@@ -1,57 +0,0 @@
-! { dg-do run }\r
-!\r
-! PR fortran/38657, in which the mixture of PRIVATE and\r
-! COMMON in TEST4, would mess up the association with\r
-! TESTCHAR in TEST2.\r
-!\r
-! Contributed by Paul Thomas <pault@gcc.gnu.org>\r
-! From a report in clf by Chris Bradley.\r
-!\r
-MODULE TEST4\r
-  PRIVATE\r
-  CHARACTER(LEN=80) :: T1 = &\r
-    "Mary had a little lamb, Its fleece was white as snow;"\r
-  CHARACTER(LEN=80) :: T2 = &\r
-    "And everywhere that Mary went, The lamb was sure to go."\r
-  CHARACTER(LEN=80) :: TESTCHAR\r
-  COMMON /TESTCOMMON1/ TESTCHAR\r
-  PUBLIC T1, T2, FOOBAR\r
-CONTAINS\r
-  subroutine FOOBAR (CHECK)\r
-    CHARACTER(LEN=80) :: CHECK\r
-    IF (TESTCHAR .NE. CHECK) CALL ABORT\r
-  end subroutine\r
-END MODULE TEST4\r
-\r
-MODULE TEST3\r
-  CHARACTER(LEN=80) :: TESTCHAR\r
-  COMMON /TESTCOMMON1/ TESTCHAR\r
-END MODULE TEST3\r
-\r
-MODULE TEST2\r
-  use TEST4\r
-  USE TEST3, chr => testchar\r
-  PRIVATE\r
-  CHARACTER(LEN=80) :: TESTCHAR\r
-  COMMON /TESTCOMMON1/ TESTCHAR\r
-  PUBLIC TESTCHAR, FOO, BAR, CHR, T1, T2, FOOBAR
-contains
-  subroutine FOO
-    TESTCHAR = T1
-  end subroutine
-  subroutine BAR (CHECK)\r
-    CHARACTER(LEN=80) :: CHECK
-    IF (TESTCHAR .NE. CHECK) CALL ABORT\r
-    IF (CHR .NE. CHECK) CALL ABORT\r
-  end subroutine
-END MODULE TEST2\r
-\r
-PROGRAM TEST1\r
-  USE TEST2
-  call FOO
-  call BAR (T1)
-  TESTCHAR = T2
-  call BAR (T2)
-  CALL FOOBAR (T2)\r
-END PROGRAM TEST1\r
-! { dg-final { cleanup-modules "TEST2 TEST3 TEST4" } }\r