This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] Fix gfortran ICE with a call to alternate return subroutine (take 2)
- From: Jakub Jelinek <jakub at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org, fortran at gcc dot gnu dot org
- Date: Mon, 6 Jun 2005 15:55:28 -0400
- Subject: [PATCH] Fix gfortran ICE with a call to alternate return subroutine (take 2)
- References: <20050523133905.GG4930@devserv.devel.redhat.com>
- Reply-to: Jakub Jelinek <jakub at redhat dot com>
Hi!
http://gcc.gnu.org/ml/gcc-patches/2005-05/msg02179.html
now longer applies cleanly, so I'm posting an updated patch
(tested today on both HEAD (i386-linux) and 4.0 branch
({i386,x86_64,ppc,ppc64,s390,s390x}-linux)).
Ok for HEAD and 4.0 once 4.0 branch reopens?
2005-06-06 Jakub Jelinek <jakub@redhat.com>
* trans-expr.c (gfc_conv_function_call): Return int instead of
void. Use a local variable for has_alternate_specifier and
return it. Avoid modification of function type's return value
in place, since it may be shared.
* trans.h (has_alternate_specifier): Remove.
(gfc_conv_function_call): Change return type.
* trans-stmt.c (has_alternate_specifier): Remove.
(gfc_trans_call): Add a local has_alternate_specifier variable,
set it from gfc_conv_function_call return value.
* gfortran.dg/altreturn_1.f90: New test.
--- gcc/fortran/trans-expr.c.jj 2005-05-23 13:23:06.000000000 +0200
+++ gcc/fortran/trans-expr.c 2005-05-23 14:53:39.000000000 +0200
@@ -1074,9 +1074,10 @@ gfc_conv_function_val (gfc_se * se, gfc_
/* Generate code for a procedure call. Note can return se->post != NULL.
- If se->direct_byref is set then se->expr contains the return parameter. */
+ If se->direct_byref is set then se->expr contains the return parameter.
+ Return non-zero, if the call has alternate specifiers. */
-void
+int
gfc_conv_function_call (gfc_se * se, gfc_symbol * sym,
gfc_actual_arglist * arg)
{
@@ -1092,6 +1093,7 @@ gfc_conv_function_call (gfc_se * se, gfc
tree len;
tree stringargs;
gfc_formal_arglist *formal;
+ int has_alternate_specifier = 0;
arglist = NULL_TREE;
stringargs = NULL_TREE;
@@ -1124,7 +1126,7 @@ gfc_conv_function_call (gfc_se * se, gfc
/* Bundle in the string length. */
se->string_length = len;
- return;
+ return 0;
}
}
info = &se->ss->data.info;
@@ -1308,9 +1310,17 @@ gfc_conv_function_call (gfc_se * se, gfc
/* Generate the actual call. */
gfc_conv_function_val (se, sym);
/* If there are alternate return labels, function type should be
- integer. */
- if (has_alternate_specifier)
- TREE_TYPE (TREE_TYPE (TREE_TYPE (se->expr))) = integer_type_node;
+ integer. Can't modify the type in place though, since it can be shared
+ with other functions. */
+ if (has_alternate_specifier
+ && TREE_TYPE (TREE_TYPE (TREE_TYPE (se->expr))) != integer_type_node)
+ {
+ gcc_assert (! sym->attr.dummy);
+ TREE_TYPE (sym->backend_decl)
+ = build_function_type (integer_type_node,
+ TYPE_ARG_TYPES (TREE_TYPE (sym->backend_decl)));
+ se->expr = gfc_build_addr_expr (NULL, sym->backend_decl);
+ }
fntype = TREE_TYPE (TREE_TYPE (se->expr));
se->expr = build3 (CALL_EXPR, TREE_TYPE (fntype), se->expr,
@@ -1382,6 +1392,8 @@ gfc_conv_function_call (gfc_se * se, gfc
}
}
}
+
+ return has_alternate_specifier;
}
--- gcc/fortran/trans.h.jj 2005-04-29 09:36:07.000000000 +0200
+++ gcc/fortran/trans.h 2005-05-23 13:56:02.000000000 +0200
@@ -301,7 +301,7 @@ void gfc_conv_intrinsic_function (gfc_se
int gfc_is_intrinsic_libcall (gfc_expr *);
/* Also used to CALL subroutines. */
-void gfc_conv_function_call (gfc_se *, gfc_symbol *, gfc_actual_arglist *);
+int gfc_conv_function_call (gfc_se *, gfc_symbol *, gfc_actual_arglist *);
/* gfc_trans_* shouldn't call push/poplevel, use gfc_push/pop_scope */
/* Generate code for a scalar assignment. */
@@ -574,7 +574,4 @@ struct lang_decl GTY(())
arg1, arg2)
#define build3_v(code, arg1, arg2, arg3) build3(code, void_type_node, \
arg1, arg2, arg3)
-
-/* flag for alternative return labels. */
-extern int has_alternate_specifier; /* for caller */
#endif /* GFC_TRANS_H */
--- gcc/fortran/trans-stmt.c.jj 2005-05-19 09:31:31.000000000 +0200
+++ gcc/fortran/trans-stmt.c 2005-05-23 14:07:55.000000000 +0200
@@ -37,8 +37,6 @@ Software Foundation, 59 Temple Place - S
#include "trans-const.h"
#include "arith.h"
-int has_alternate_specifier;
-
typedef struct iter_info
{
tree var;
@@ -206,6 +204,7 @@ tree
gfc_trans_call (gfc_code * code)
{
gfc_se se;
+ int has_alternate_specifier;
/* A CALL starts a new block because the actual arguments may have to
be evaluated first. */
@@ -213,10 +212,10 @@ gfc_trans_call (gfc_code * code)
gfc_start_block (&se.pre);
gcc_assert (code->resolved_sym);
- has_alternate_specifier = 0;
/* Translate the call. */
- gfc_conv_function_call (&se, code->resolved_sym, code->ext.actual);
+ has_alternate_specifier
+ = gfc_conv_function_call (&se, code->resolved_sym, code->ext.actual);
/* A subroutine without side-effect, by definition, does nothing! */
TREE_SIDE_EFFECTS (se.expr) = 1;
--- gcc/testsuite/gfortran.dg/altreturn_1.f90.jj 2005-05-23 15:02:18.000000000 +0200
+++ gcc/testsuite/gfortran.dg/altreturn_1.f90 2005-05-23 15:02:50.000000000 +0200
@@ -0,0 +1,7 @@
+! { dg-do compile }
+ subroutine foo (a)
+ real t, a, baz
+ call bar (*10)
+ t = 2 * baz ()
+ IF (t.gt.0) t = baz ()
+10 END
Jakub