From: Mikael Morin <mikael.morin@sfr.fr>
To: Paul Richard Thomas <paul.richard.thomas@gmail.com>
Cc: gfortran <fortran@gcc.gnu.org>, gcc-patches <gcc-patches@gcc.gnu.org>
Subject: Re: [Patch, fortran] PR54107 ICE on recursive interface
Date: Fri, 08 Feb 2013 15:37:00 -0000 [thread overview]
Message-ID: <51151BC3.6050005@sfr.fr> (raw)
In-Reply-To: <CAGkQGiKkr1Q7FMh1=bsFyYUrdyThiOsg85gwW_=MoJcLKFS=4A@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 374 bytes --]
Le 08/02/2013 14:06, Paul Richard Thomas a écrit :
> What's happened to the testcase? There are still lots of commented
> out lines that I presume are fixed.
>
Well, I was playing with the testcase just before I sent the patch for
review ð.
Attached is what I have committed - testcase fixed, as well as a typo
(recrusive).
Thanks for the review.
Mikael
[-- Attachment #2: r195890.diff --]
[-- Type: text/plain, Size: 4142 bytes --]
Index: testsuite/gfortran.dg/recursive_interface_2.f90
===================================================================
--- testsuite/gfortran.dg/recursive_interface_2.f90 (révision 0)
+++ testsuite/gfortran.dg/recursive_interface_2.f90 (révision 195890)
@@ -0,0 +1,22 @@
+! { dg-do compile }
+!
+! PR fortran/54107
+! Recursive interfaces used to lead to an infinite recursion during
+! translation.
+
+module m
+ contains
+ subroutine foo (arg)
+ procedure(foo) :: arg
+ end subroutine
+ function foo2 (arg) result(r)
+ procedure(foo2) :: arg
+ procedure(foo2), pointer :: r
+ end function
+ subroutine bar (arg)
+ procedure(baz) :: arg
+ end subroutine
+ subroutine baz (arg)
+ procedure(bar) :: arg
+ end subroutine
+end module m
Index: testsuite/ChangeLog
===================================================================
--- testsuite/ChangeLog (révision 195889)
+++ testsuite/ChangeLog (révision 195890)
@@ -1,3 +1,8 @@
+2013-02-08 Mikael Morin <mikael@gcc.gnu.org>
+
+ PR fortran/54107
+ * gfortran.dg/recursive_interface_2.f90: New test.
+
2013-02-08 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/56250
Index: fortran/ChangeLog
===================================================================
--- fortran/ChangeLog (révision 195889)
+++ fortran/ChangeLog (révision 195890)
@@ -1,3 +1,11 @@
+2013-02-08 Mikael Morin <mikael@gcc.gnu.org>
+
+ PR fortran/54107
+ * trans-types.c (gfc_get_function_type): Change a NULL backend_decl
+ to error_mark_node on entry. Detect recursive types. Build a variadic
+ procedure type if the type is recursive. Restore the initial
+ backend_decl.
+
2013-02-07 Tobias Burnus <burnus@net-b.de>
PR fortran/54339
Index: fortran/trans-types.c
===================================================================
--- fortran/trans-types.c (révision 195889)
+++ fortran/trans-types.c (révision 195890)
@@ -2711,19 +2711,23 @@ gfc_get_function_type (gfc_symbol * sym)
gfc_formal_arglist *f;
gfc_symbol *arg;
int alternate_return;
- bool is_varargs = true;
+ bool is_varargs = true, recursive_type = false;
/* Make sure this symbol is a function, a subroutine or the main
program. */
gcc_assert (sym->attr.flavor == FL_PROCEDURE
|| sym->attr.flavor == FL_PROGRAM);
- if (sym->backend_decl)
- {
- if (sym->attr.proc_pointer)
- return TREE_TYPE (TREE_TYPE (sym->backend_decl));
- return TREE_TYPE (sym->backend_decl);
- }
+ /* To avoid recursing infinitely on recursive types, we use error_mark_node
+ so that they can be detected here and handled further down. */
+ if (sym->backend_decl == NULL)
+ sym->backend_decl = error_mark_node;
+ else if (sym->backend_decl == error_mark_node)
+ recursive_type = true;
+ else if (sym->attr.proc_pointer)
+ return TREE_TYPE (TREE_TYPE (sym->backend_decl));
+ else
+ return TREE_TYPE (sym->backend_decl);
alternate_return = 0;
typelist = NULL;
@@ -2775,6 +2779,13 @@ gfc_get_function_type (gfc_symbol * sym)
if (arg->attr.flavor == FL_PROCEDURE)
{
+ /* We don't know in the general case which argument causes
+ recursion. But we know that it is a procedure. So we give up
+ creating the procedure argument type list at the first
+ procedure argument. */
+ if (recursive_type)
+ goto arg_type_list_done;
+
type = gfc_get_function_type (arg);
type = build_pointer_type (type);
}
@@ -2828,6 +2839,11 @@ gfc_get_function_type (gfc_symbol * sym)
|| sym->attr.if_source != IFSRC_UNKNOWN)
is_varargs = false;
+arg_type_list_done:
+
+ if (!recursive_type && sym->backend_decl == error_mark_node)
+ sym->backend_decl = NULL_TREE;
+
if (alternate_return)
type = integer_type_node;
else if (!sym->attr.function || gfc_return_by_reference (sym))
@@ -2865,7 +2881,7 @@ gfc_get_function_type (gfc_symbol * sym)
else
type = gfc_sym_type (sym);
- if (is_varargs)
+ if (is_varargs || recursive_type)
type = build_varargs_function_type_vec (type, typelist);
else
type = build_function_type_vec (type, typelist);
prev parent reply other threads:[~2013-02-08 15:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-07 22:28 Mikael Morin
2013-02-08 13:06 ` Paul Richard Thomas
2013-02-08 15:37 ` Mikael Morin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51151BC3.6050005@sfr.fr \
--to=mikael.morin@sfr.fr \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=paul.richard.thomas@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).