From: Tobias Burnus <burnus@net-b.de>
Date: Wed, 10 Sep 2008 11:54:08 +0000 (+0200)
Subject: re PR fortran/37420 (-Wunused-variable broken)
X-Git-Tag: releases/gcc-4.4.0~2518
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06c7153ff1c52ab47808fc00b72b98894ec858b8;p=thirdparty%2Fgcc.git

re PR fortran/37420 (-Wunused-variable broken)

2008-09-10  Tobias Burnus  <burnus@net-b.de>

        PR fortran/37420
        * trans-decl.c (get_proc_pointer_decl): Fix -Wunused-variable.

2008-09-10  Tobias Burnus  <burnus@net-b.de>

        PR fortran/37420
        * gfortran.dg/warn_unused_var.f90: New test.
        * gfortran.dg/warn_unused_var.f90: Add cleanup-modules.

From-SVN: r140229
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index c8f1aaf5d92c..eef75e2bbd79 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-10  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/37420
+	* trans-decl.c (get_proc_pointer_decl): Fix -Wunused-variable.
+
 2008-09-09  Daniel Kraft  <d@domob.eu>
 
 	PR fortran/37429
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 72f59737ae69..ec00ee2ee8fd 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -1170,7 +1170,8 @@ get_proc_pointer_decl (gfc_symbol *sym)
   decl = build_decl (VAR_DECL, get_identifier (sym->name),
 		     build_pointer_type (gfc_get_function_type (sym)));
 
-  if (sym->ns->proc_name->backend_decl == current_function_decl
+  if ((sym->ns->proc_name
+      && sym->ns->proc_name->backend_decl == current_function_decl)
       || sym->attr.contained)
     gfc_add_decl_to_function (decl);
   else
@@ -3476,11 +3477,6 @@ generate_local_decl (gfc_symbol * sym)
 {
   if (sym->attr.flavor == FL_VARIABLE)
     {
-      /* Check for dependencies in the array specification and string
-	length, adding the necessary declarations to the function.  We
-	mark the symbol now, as well as in traverse_ns, to prevent
-	getting stuck in a circular dependency.  */
-      sym->mark = 1;
       if (!sym->attr.dummy && !sym->ns->proc_name->attr.entry_master)
         generate_dependency_declarations (sym);
 
@@ -3516,6 +3512,12 @@ generate_local_decl (gfc_symbol * sym)
 	  gfc_get_symbol_decl (sym);
 	}
 
+      /* Check for dependencies in the array specification and string
+	length, adding the necessary declarations to the function.  We
+	mark the symbol now, as well as in traverse_ns, to prevent
+	getting stuck in a circular dependency.  */
+      sym->mark = 1;
+
       /* We do not want the middle-end to warn about unused parameters
          as this was already done above.  */
       if (sym->attr.dummy && sym->backend_decl != NULL_TREE)
@@ -3545,7 +3547,7 @@ generate_local_decl (gfc_symbol * sym)
 		        &sym->result->declared_at);
 
 	  /* Prevents "Unused variable" warning for RESULT variables.  */
-	  sym->mark = sym->result->mark = 1;
+	  sym->result->mark = 1;
 	}
     }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 51332f366d3c..f78e376cea9d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-10  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/37420
+	* gfortran.dg/warn_unused_var.f90: New test.
+	* gfortran.dg/warn_unused_var.f90: Add cleanup-modules.
+
 2008-09-10  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/37353
diff --git a/gcc/testsuite/gfortran.dg/implicit_12.f90 b/gcc/testsuite/gfortran.dg/implicit_12.f90
index 8136a1839710..4e9c256d286c 100644
--- a/gcc/testsuite/gfortran.dg/implicit_12.f90
+++ b/gcc/testsuite/gfortran.dg/implicit_12.f90
@@ -21,3 +21,5 @@ program startest
    if('#'//Q2//'#' /='#abcdefghijkl#') call abort()
    call sub('ABCDEFGHIJKLM') ! len=13
 end program startest
+
+! { dg-final { cleanup-modules "mod" } }
diff --git a/gcc/testsuite/gfortran.dg/warn_unused_var.f90 b/gcc/testsuite/gfortran.dg/warn_unused_var.f90
new file mode 100644
index 000000000000..1858e6852402
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/warn_unused_var.f90
@@ -0,0 +1,7 @@
+! { dg-do compile }
+! { dg-options "-Wunused-variable" }
+!
+! PR fortran/37420
+!
+integer :: i ! { dg-warning "Unused variable" }
+end