diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2018-08-04 17:37:23 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2018-08-04 17:37:23 +0200 |
| commit | d50cd259bec418ea0f4e3903f578301982e2d183 (patch) | |
| tree | f850d39f5f7df03a4a387ce8e16ce2a672f215c9 | |
| parent | 5b1dd92aac62ac64a930d5c49f4fea1a305cfb6e (diff) | |
| download | gcc-d50cd259bec418ea0f4e3903f578301982e2d183.zip gcc-d50cd259bec418ea0f4e3903f578301982e2d183.tar.gz gcc-d50cd259bec418ea0f4e3903f578301982e2d183.tar.bz2 | |
re PR fortran/45521 ([F08] GENERIC resolution with ALLOCATABLE/POINTER and PROCEDURE)
2018-08-04 Janus Weil <janus@gcc.gnu.org>
PR fortran/45521
* interface.c (gfc_compare_interfaces): Apply additional
distinguishability criteria of F08 to operator interfaces.
2018-08-04 Janus Weil <janus@gcc.gnu.org>
PR fortran/45521
* gfortran.dg/interface_assignment_6.f90: New test case.
From-SVN: r263308
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/interface.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/interface_assignment_6.f90 | 30 |
4 files changed, 52 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9454102..ced9c91 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2018-08-04 Janus Weil <janus@gcc.gnu.org> + + PR fortran/45521 + * interface.c (gfc_compare_interfaces): Apply additional + distinguishability criteria of F08 to operator interfaces. + 2018-07-31 Andre Vieira <andre.simoesdiasvieira@arm.com> Revert 'AsyncI/O patch committed' diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 9da654e..32aae0e 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -1776,7 +1776,7 @@ gfc_compare_interfaces (gfc_symbol *s1, gfc_symbol *s2, const char *name2, } else { - /* Only check type and rank. */ + /* Operators: Only check type and rank of arguments. */ if (!compare_type (f2->sym, f1->sym)) { if (errmsg != NULL) @@ -1794,6 +1794,15 @@ gfc_compare_interfaces (gfc_symbol *s1, gfc_symbol *s2, const char *name2, symbol_rank (f2->sym)); return false; } + if ((gfc_option.allow_std & GFC_STD_F2008) + && (compare_ptr_alloc(f1->sym, f2->sym) + || compare_ptr_alloc(f2->sym, f1->sym))) + { + if (errmsg != NULL) + snprintf (errmsg, err_len, "Mismatching POINTER/ALLOCATABLE " + "attribute in argument '%s' ", f1->sym->name); + return false; + } } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 551400c..278ea3d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ + +2018-08-04 Janus Weil <janus@gcc.gnu.org> + + PR fortran/45521 + * gfortran.dg/interface_assignment_6.f90: New test case. + 2018-08-04 Uros Bizjak <ubizjak@gmail.com> PR testsuite/86153 diff --git a/gcc/testsuite/gfortran.dg/interface_assignment_6.f90 b/gcc/testsuite/gfortran.dg/interface_assignment_6.f90 new file mode 100644 index 0000000..81171b4 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/interface_assignment_6.f90 @@ -0,0 +1,30 @@ +! { dg-do compile } +! +! PR 45521: [F08] GENERIC resolution with ALLOCATABLE/POINTER and PROCEDURE +! +! Contributed by Janus Weil <janus@gcc.gnu.org> + +module inteface_assignment_6 + + type :: t + end type + + ! this was rejected as ambiguous, but is valid in F08 + interface assignment(=) + procedure testAlloc + procedure testPtr + end interface + +contains + + subroutine testAlloc(obj, val) + type(t), allocatable, intent(out) :: obj + integer, intent(in) :: val + end subroutine + + subroutine testPtr(obj, val) + type(t), pointer, intent(out) :: obj + integer, intent(in) :: val + end subroutine + +end |