Patchwork [Fortran] Resolve intrinsic module-procs only once

login
register
mail settings
Submitter Tobias Burnus
Date May 12, 2011, 2:19 p.m.
Message ID <4DCBEC54.60801@net-b.de>
Download mbox | patch
Permalink /patch/95319/
State New
Headers show

Comments

Tobias Burnus - May 12, 2011, 2:19 p.m.
If an intrinsic module proc [such as ISO_Fortran_env's 
compiler_options()] is resolved multiple times, with -Wall a warning is 
printed, claiming that one has manually typed an intrinsic.

The fix is to avoid resolving the proc multiple times. Note: Typing of 
use-associated symbols will always produce an error, thus, the warning 
is unreachable and not needed for intrinsics originating from modules.

Build and regtested on x86-64-linux.
OK for the trunk?

Tobias

Patch

2011-05-12  Tobias Burnus  <burnus@net-b.de>

	PR fortran/48972
	* resolve.c (resolve_intrinsic): Don't resolve module
	intrinsics multiple times.

2011-05-12  Tobias Burnus  <burnus@net-b.de>

	PR fortran/48972
	* gfortran.dg/iso_c_binding_compiler_3.f90: New.

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index a19b103..3483bc7 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -1441,6 +1441,10 @@  resolve_intrinsic (gfc_symbol *sym, locus *loc)
   if (sym->formal)
     return SUCCESS;
 
+  /* Already resolved.  */
+  if (sym->from_intmod && sym->ts.type != BT_UNKNOWN)
+    return SUCCESS;
+
   /* We already know this one is an intrinsic, so we don't call
      gfc_is_intrinsic for full checking but rather use gfc_find_function and
      gfc_find_subroutine directly to check whether it is a function or
--- /dev/null	2011-05-12 07:35:17.079892192 +0200
+++ gcc/gcc/testsuite/gfortran.dg/iso_c_binding_compiler_3.f90	2011-05-12 13:51:04.000000000 +0200
@@ -0,0 +1,27 @@ 
+! { dg-do compile }
+! { dg-options "-Wall" }
+!
+! PR fortran/45823
+!
+! We used to warn about 
+!  "Type specified for intrinsic function" for this file
+!
+
+use iso_c_binding
+use iso_Fortran_env
+implicit none
+intrinsic sin
+real :: x = 3.4
+print *, sin(x), c_sizeof(c_int), compiler_options(), compiler_version()
+end
+
+
+module test_mod
+    use iso_fortran_env
+end module test_mod
+
+subroutine test
+use test_mod
+end subroutine test
+
+! { dg-final { cleanup-modules "test_mod" } }