backport: re PR fortran/52452 (INTRINSIC cannot be applied to gfortran's ETIME)

2012-03-06  Tobias Burnus  <burnus@net-b.de>

        Backport from mainline
        2012-03-02  Tobias Burnus  <burnus@net-b.de>

        PR fortran/52452
        * resolve.c (resolve_intrinsic): Don't search for a
        function if we know that it is a subroutine.

2012-03-06  Tobias Burnus  <burnus@net-b.de>

        Backport from mainline
        2012-03-02  Tobias Burnus  <burnus@net-b.de>

        PR fortran/52452
        * gfortran.dg/intrinsic_8.f90: New.

From-SVN: r185006

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 812be0e95af869e340cc01cfc4e111f5404bbf75..9271062ecf508b060fec13e246923bc6f75d821e 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-06  Tobias Burnus  <burnus@net-b.de>
+
+       Backport from mainline
+       2012-03-02  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/52452
+       * resolve.c (resolve_intrinsic): Don't search for a
+       function if we know that it is a subroutine.
+
 2012-02-23  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/52335

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 7abddb593a0ff40a3d3bf4dcdde36195c10a8933..e410f62015ebc0d9f4be8f843759d2390c54fa34 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -1211,7 +1211,7 @@ resolve_intrinsic (gfc_symbol *sym, locus *loc)
      gfc_find_subroutine directly to check whether it is a function or
      subroutine.  */
 
-  if ((isym = gfc_find_function (sym->name)))
+  if (!sym->attr.subroutine  && (isym = gfc_find_function (sym->name)))
     {
       if (sym->ts.type != BT_UNKNOWN && gfc_option.warn_surprising
          && !sym->attr.implicit_type)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cff865b5742cecd90cf186c7b10e8b72c0118df0..e4a7cf9901f5c162dc74be0dad6a1c58d2cb70ce 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-06  Tobias Burnus  <burnus@net-b.de>
+
+       Backport from mainline
+       2012-03-02  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/52452
+       * gfortran.dg/intrinsic_8.f90: New.
+
 2012-03-06  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from 4.6 branch

diff --git a/gcc/testsuite/gfortran.dg/intrinsic_8.f90 b/gcc/testsuite/gfortran.dg/intrinsic_8.f90
new file mode 100644 (file)
index 0000000..a427c70
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/intrinsic_8.f90
@@ -0,0 +1,23 @@
+! { dg-do compile }
+!
+! PR fortran/52452
+!
+! Contributed by Roger Ferrer Ibanez
+!
+PROGRAM test_etime
+    IMPLICIT NONE
+    INTRINSIC :: etime
+    REAL(4) :: tarray(1:2)
+    REAL(4) :: result
+
+    CALL etime(tarray, result)
+END PROGRAM test_etime
+
+subroutine test_etime2
+    IMPLICIT NONE
+    INTRINSIC :: etime
+    REAL(4) :: tarray(1:2)
+    REAL(4) :: result
+
+    result = etime(tarray)
+END subroutine test_etime2