diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2018-01-29 07:11:16 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2018-01-29 07:11:16 +0000 |
| commit | 3be34c0b1dec1272dfabec1e94a4666e9499fdc1 (patch) | |
| tree | d1acf816d6e79e1b17fc516eaa0ccb9955c86ab6 /gcc | |
| parent | d6ffdc5b0a7e6fcd42fa9d658008589b6175e87c (diff) | |
| download | gcc-3be34c0b1dec1272dfabec1e94a4666e9499fdc1.zip gcc-3be34c0b1dec1272dfabec1e94a4666e9499fdc1.tar.gz gcc-3be34c0b1dec1272dfabec1e94a4666e9499fdc1.tar.bz2 | |
re PR fortran/84073 (In -fc-prototypes fixed (nonzero) length strings are mapped to plain char in prototype.)
2017-01-29 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/84073
* resolve.c (resolve_component): Ensure BIND(C) character
components have length one.
(resolve_symbol): Likewise for variables.
2017-01-29 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/84073
* gfortran.dg/bind_c_usage_31.f90: New test.
From-SVN: r257138
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 20 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/bind_c_usage_31.f90 | 9 |
4 files changed, 41 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 8660530..96e6fb2 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2017-01-29 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/84073 + * resolve.c (resolve_component): Ensure BIND(C) character + components have length one. + (resolve_symbol): Likewise for variables. + 2018-01-27 Jakub Jelinek <jakub@redhat.com> PR fortran/84065 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 8078005..9c8ba86 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -13557,6 +13557,17 @@ resolve_component (gfc_component *c, gfc_symbol *sym) return false; } + /* F2003, 15.2.1 - length has to be one. */ + if (sym->attr.is_bind_c && c->ts.type == BT_CHARACTER + && (c->ts.u.cl == NULL || c->ts.u.cl->length == NULL + || !gfc_is_constant_expr (c->ts.u.cl->length) + || mpz_cmp_si (c->ts.u.cl->length->value.integer, 1) != 0)) + { + gfc_error ("Component %qs of BIND(C) type at %L must have length one", + c->name, &c->loc); + return false; + } + if (c->attr.proc_pointer && c->ts.interface) { gfc_symbol *ifc = c->ts.interface; @@ -14804,6 +14815,15 @@ resolve_symbol (gfc_symbol *sym) "module level scope", sym->name, &(sym->declared_at)); t = false; } + else if (sym->ts.type == BT_CHARACTER + && (sym->ts.u.cl == NULL || sym->ts.u.cl->length == NULL + || !gfc_is_constant_expr (sym->ts.u.cl->length) + || mpz_cmp_si (sym->ts.u.cl->length->value.integer, 1) != 0)) + { + gfc_error ("BIND(C) Variable %qs at %L must have length one", + sym->name, &sym->declared_at); + t = false; + } else if (sym->common_head != NULL && sym->attr.implicit_type == 0) { t = verify_com_block_vars_c_interop (sym->common_head); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9470667..fa663f2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-01-29 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/84073 + * gfortran.dg/bind_c_usage_31.f90: New test. + 2018-01-27 Paolo Carlini <paolo.carlini@oracle.com> PR c++/83924 diff --git a/gcc/testsuite/gfortran.dg/bind_c_usage_31.f90 b/gcc/testsuite/gfortran.dg/bind_c_usage_31.f90 new file mode 100644 index 0000000..052713e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/bind_c_usage_31.f90 @@ -0,0 +1,9 @@ +! { dg-do compile } +! PR fortran/84073 - this was accepted before. +module mod + use iso_c_binding + type, bind(c) :: a + character(len=2,kind=c_char) :: b ! { dg-error "must have length one" } + end type a + character(len=2), bind(C) :: c ! { dg-error "must have length one" } +end module mod |