From: janus Date: Mon, 22 Jun 2009 21:02:19 +0000 (+0000) Subject: 2009-06-22 Janus Weil X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=0bfdce5ee421d188321f7deaa747b0d22835efeb 2009-06-22 Janus Weil PR fortran/37254 PR fortran/39850 * interface.c (compare_parameter): Set implicit type for function actual arguments with BT_UNKNOWN. 2009-06-22 Janus Weil PR fortran/37254 PR fortran/39850 * gfortran.dg/interface_30.f90: Modified error message. * gfortran.dg/proc_decl_22.f90: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148816 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b502caf53ae..cda349d35bb 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2009-06-22 Janus Weil + + PR fortran/37254 + PR fortran/39850 + * interface.c (compare_parameter): Set implicit type for function + actual arguments with BT_UNKNOWN. + 2009-06-22 Tobias Burnus PR fortran/40472 diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 53cc95fe76e..c6da6f880dd 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -1407,9 +1407,14 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual, } if (formal->attr.function && !act_sym->attr.function) - gfc_add_function (&act_sym->attr, act_sym->name, &act_sym->declared_at); - - if (formal->attr.subroutine && !act_sym->attr.subroutine) + { + gfc_add_function (&act_sym->attr, act_sym->name, + &act_sym->declared_at); + if (act_sym->ts.type == BT_UNKNOWN + && gfc_set_default_type (act_sym, 1, act_sym->ns) == FAILURE) + return 0; + } + else if (formal->attr.subroutine && !act_sym->attr.subroutine) gfc_add_subroutine (&act_sym->attr, act_sym->name, &act_sym->declared_at); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2bb9f6f8695..59918e1f40b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2009-06-22 Janus Weil + + PR fortran/37254 + PR fortran/39850 + * gfortran.dg/interface_30.f90: Modified error message. + * gfortran.dg/proc_decl_22.f90: New. + 2009-06-22 Ian Lance Taylor * gcc.dg/Wcxx-compat-19.c: New testcase. diff --git a/gcc/testsuite/gfortran.dg/interface_30.f90 b/gcc/testsuite/gfortran.dg/interface_30.f90 index 0576a42510e..cfea7068ab2 100644 --- a/gcc/testsuite/gfortran.dg/interface_30.f90 +++ b/gcc/testsuite/gfortran.dg/interface_30.f90 @@ -15,9 +15,9 @@ program test call sub1(func1) call sub2(func2) call sub1(func3) - call sub2(func3) ! { dg-error "Type mismatch in argument" } + call sub2(func3) ! { dg-error "is not a subroutine" } call sub2(func4) - call sub1(func4) ! { dg-error "Interface mismatch in dummy procedure" } + call sub1(func4) ! { dg-error "is not a function" } contains subroutine sub1(a1) interface diff --git a/gcc/testsuite/gfortran.dg/proc_decl_22.f90 b/gcc/testsuite/gfortran.dg/proc_decl_22.f90 new file mode 100755 index 00000000000..40060061aef --- /dev/null +++ b/gcc/testsuite/gfortran.dg/proc_decl_22.f90 @@ -0,0 +1,25 @@ +! { dg-do compile } +! +! PR 37254: Reject valid PROCEDURE statement with implicit interface +! +! Original test case by Dominique d'Humieres +! Modified by Janus Weil + + real function proc3( arg1 ) + integer :: arg1 + proc3 = arg1+7 + end function proc3 + +program myProg + PROCEDURE () :: proc3 + call proc4( proc3 ) + +contains + + subroutine proc4( arg1 ) + PROCEDURE(real) :: arg1 + print*, 'the func: ', arg1(0) + end subroutine proc4 + +end program myProg +