diff options
| author | Tobias Burnus <burnus@net-b.de> | 2014-02-18 23:09:39 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2014-02-18 23:09:39 +0100 |
| commit | ab1668f602746b9753b7a4f6c334d98b2711af0c (patch) | |
| tree | acc9dd8a0b0f0ec03ea9b2c53b8b46e36c53652d /gcc | |
| parent | 70aacc9798fda3e38b42e04a57385f129c718837 (diff) | |
| download | gcc-ab1668f602746b9753b7a4f6c334d98b2711af0c.zip gcc-ab1668f602746b9753b7a4f6c334d98b2711af0c.tar.gz gcc-ab1668f602746b9753b7a4f6c334d98b2711af0c.tar.bz2 | |
re PR fortran/49397 ([F03] ICE with proc pointer assignment)
2014-02-18 Tobias Burnus <burnus@net-b.de>
PR fortran/49397
* expr.c (gfc_check_pointer_assign): Add check for
F2008Cor2, C729.
* trans-decl.c (gfc_get_symbol_decl): Correctly generate
* external
decl in a corner case.
2014-02-18 Tobias Burnus <burnus@net-b.de>
PR fortran/49397
* gfortran.dg/proc_ptr_45.f90: New.
* gfortran.dg/proc_ptr_46.f90: New.
From-SVN: r207854
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 10 | ||||
| -rw-r--r-- | gcc/fortran/trans-decl.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 |
4 files changed, 27 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index c1e5b6d..c1bca00 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2014-02-18 Tobias Burnus <burnus@net-b.de> + + PR fortran/49397 + * expr.c (gfc_check_pointer_assign): Add check for + F2008Cor2, C729. + * trans-decl.c (gfc_get_symbol_decl): Correctly generate external + decl in a corner case. + 2014-02-18 Janus Weil <janus@gcc.gnu.org> PR fortran/60231 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 818212a..fe6eab5 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -3581,6 +3581,16 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue) return false; } + /* Check F2008Cor2, C729. */ + if (!s2->attr.intrinsic && s2->attr.if_source == IFSRC_UNKNOWN + && !s2->attr.external && !s2->attr.subroutine && !s2->attr.function) + { + gfc_error ("Procedure pointer target '%s' at %L must be either an " + "intrinsic, host or use associated, referenced or have " + "the EXTERNAL attribute", s2->name, &rvalue->where); + return false; + } + return true; } diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 9c86653..cf7b661 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -1362,9 +1362,10 @@ gfc_get_symbol_decl (gfc_symbol * sym) if (sym->attr.flavor == FL_PROCEDURE) { - /* Catch function declarations. Only used for actual parameters, + /* Catch functions. Only used for actual parameters, procedure pointers and procptr initialization targets. */ - if (sym->attr.external || sym->attr.use_assoc || sym->attr.intrinsic) + if (sym->attr.use_assoc || sym->attr.intrinsic + || sym->attr.if_source != IFSRC_DECL) { decl = gfc_get_extern_function_decl (sym); gfc_set_decl_location (decl, &sym->declared_at); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cd31dd9..780614c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-02-18 Tobias Burnus <burnus@net-b.de> + + PR fortran/49397 + * gfortran.dg/proc_ptr_45.f90: New. + * gfortran.dg/proc_ptr_46.f90: New. + 2014-02-18 Adam Butcher <adam@jessamine.co.uk> PR c++/60190 |