From ba3721c1c20ccd158a3631af7518e6d1d2662514 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Sun, 15 Aug 2010 18:20:56 +0200 Subject: [PATCH] re PR fortran/45211 (C interoperable error when compiling BIND(C) function in a module.) 2010-08-15 Tobias Burnus PR fortran/45211 * decl.c (verify_c_interop_param): Remove superfluous space (" "). (verify_c_interop): Handle unresolved DT with bind(C). 2010-08-15 Tobias Burnus PR fortran/45211 * gfortran.dg/bind_c_usage_21.f90: New. * gfortran.dg/bind_c_dts_3.f03: Update dg-error. From-SVN: r163264 --- gcc/fortran/ChangeLog | 6 +++++ gcc/fortran/decl.c | 5 ++-- gcc/testsuite/ChangeLog | 6 +++++ gcc/testsuite/gfortran.dg/bind_c_dts_3.f03 | 2 +- gcc/testsuite/gfortran.dg/bind_c_usage_21.f90 | 25 +++++++++++++++++++ 5 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/bind_c_usage_21.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4bddcb43aaa..b88d9c9e985 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2010-08-15 Tobias Burnus + + PR fortran/45211 + * decl.c (verify_c_interop_param): Remove superfluous space (" "). + (verify_c_interop): Handle unresolved DT with bind(C). + 2010-08-15 Tobias Burnus * trans-expr.c (gfc_conv_expr_present): Regard nullified diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index be41af869c7..5baa400f0ac 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -991,7 +991,7 @@ verify_c_interop_param (gfc_symbol *sym) /* Make personalized messages to give better feedback. */ if (sym->ts.type == BT_DERIVED) gfc_error ("Type '%s' at %L is a parameter to the BIND(C) " - " procedure '%s' but is not C interoperable " + "procedure '%s' but is not C interoperable " "because derived type '%s' is not C interoperable", sym->name, &(sym->declared_at), sym->ns->proc_name->name, @@ -3612,7 +3612,8 @@ gfc_try verify_c_interop (gfc_typespec *ts) { if (ts->type == BT_DERIVED && ts->u.derived != NULL) - return (ts->u.derived->ts.is_c_interop ? SUCCESS : FAILURE); + return (ts->u.derived->ts.is_c_interop || ts->u.derived->attr.is_bind_c) + ? SUCCESS : FAILURE; else if (ts->is_c_interop != 1) return FAILURE; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1065b33757f..7c43d39011b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-08-15 Tobias Burnus + + PR fortran/45211 + * gfortran.dg/bind_c_usage_21.f90: New. + * gfortran.dg/bind_c_dts_3.f03: Update dg-error. + 2010-08-15 Tobias Burnus * gfortran.dg/optional_absent_1.f90: New. diff --git a/gcc/testsuite/gfortran.dg/bind_c_dts_3.f03 b/gcc/testsuite/gfortran.dg/bind_c_dts_3.f03 index 6c6da9f5785..fa54fb761be 100644 --- a/gcc/testsuite/gfortran.dg/bind_c_dts_3.f03 +++ b/gcc/testsuite/gfortran.dg/bind_c_dts_3.f03 @@ -26,7 +26,7 @@ type, bind(c):: t3 ! { dg-error "BIND.C. derived type" } end type t3 contains - subroutine sub0(my_type, expected_value) bind(c) ! { dg-error "is not C interoperable" } + subroutine sub0(my_type, expected_value) bind(c) type(my_c_type_1) :: my_type integer(c_int), value :: expected_value diff --git a/gcc/testsuite/gfortran.dg/bind_c_usage_21.f90 b/gcc/testsuite/gfortran.dg/bind_c_usage_21.f90 new file mode 100644 index 00000000000..10a86dbbbc4 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/bind_c_usage_21.f90 @@ -0,0 +1,25 @@ +! { dg-do compile } +! +! PR fortran/45211 +! +! Contributed by Scot Breitenfeld +! +module m +contains + FUNCTION liter_cb(link_info) bind(C) + USE ISO_C_BINDING + IMPLICIT NONE + + INTEGER(c_int) liter_cb + + TYPE, bind(C) :: info_t + INTEGER(c_int) :: type + END TYPE info_t + + TYPE(info_t) :: link_info + + liter_cb = 0 + END FUNCTION liter_cb +end module m + +! { dg-final { cleanup-modules "m" } }