resolve.c (resolve_elemental_actual): Handle calls to intrinsic subroutines correctly.

2008-10-16  Daniel Kraft  <d@domob.eu>

	* resolve.c (resolve_elemental_actual): Handle calls to intrinsic
	subroutines correctly.

2008-10-16  Daniel Kraft  <d@domob.eu>

	* gfortran.dg/elemental_intrinsic_1.f03: New test.

From-SVN: r141175

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 1d26c1f2c97f0cc9e59f2d650bbe3774874eddb0..d4ff6b34c306033f4e6f3d220f08378f6059e951 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-16  Daniel Kraft  <d@domob.eu>
+
+       * resolve.c (resolve_elemental_actual): Handle calls to intrinsic
+       subroutines correctly.
+
 2008-10-13  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * simplify.c: Remove MPFR_VERSION_NUM(2,3,0) conditionals.

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 70d3ad5df99862e625a88fdebf636ffe47a53428..1816907c3ec35b191446564482d0a398852b178e 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -1352,10 +1352,18 @@ resolve_elemental_actual (gfc_expr *expr, gfc_code *c)
       else
        return SUCCESS;
     }
-  else if (c && c->ext.actual != NULL && c->symtree->n.sym->attr.elemental)
+  else if (c && c->ext.actual != NULL)
     {
       arg0 = c->ext.actual;
-      esym = c->symtree->n.sym;
+      
+      if (c->resolved_sym)
+       esym = c->resolved_sym;
+      else
+       esym = c->symtree->n.sym;
+      gcc_assert (esym);
+
+      if (!esym->attr.elemental)
+       return SUCCESS;
     }
   else
     return SUCCESS;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9148684b63c36462a302f5082ddd6f097bd58406..bb15a266e086b2d3035ce5a8659c0d90cb98064f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-16  Daniel Kraft  <d@domob.eu>
+
+       * gfortran.dg/elemental_intrinsic_1.f03: New test.
+
 2008-10-16  Jakub Jelinek  <jakub@redhat.com>
 
        PR tree-optimization/37664

diff --git a/gcc/testsuite/gfortran.dg/elemental_intrinsic_1.f03 b/gcc/testsuite/gfortran.dg/elemental_intrinsic_1.f03
new file mode 100644 (file)
index 0000000..8fdaa0f
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/elemental_intrinsic_1.f03
@@ -0,0 +1,11 @@
+! { dg-do compile }
+
+! Conformance-checking of arguments was not done for intrinsic elemental
+! subroutines, check this works now.
+
+! This is the test from PR fortran/35681, comment #1 (second program).
+
+  integer, dimension(10) :: ILA1 = (/1,2,3,4,5,6,7,8,9,10/)
+  call mvbits ((ILA1((/9/))), 2, 4, ILA1, 3) ! { dg-error "Different shape" }
+  write (*,'(10(I3))') ila1
+  end