This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[lto] PATCH: CALL_EXPR changes to gcc/fortran/trans-intrinsic.c
- From: Sandra Loosemore <sandra at codesourcery dot com>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Fri, 21 Jul 2006 21:13:26 -0400
- Subject: [lto] PATCH: CALL_EXPR changes to gcc/fortran/trans-intrinsic.c
Already committed as "obvious".
2006-07-21 Sandra Loosemore <sandra@codesourcery.com>
* gcc/fortran/trans-intrinsic.c (gfc_conv_intrinsic_ctime):
Use build_call_expr.
(gfc_conv_intrinsic_fdate): Likewise.
(gfc_conv_intrinsic_ttynam): Likewise.
(gfc_conv_intrinsic_array_transfer): Likewise.
(gfc_conv_associated): Likewise.
(call_builtin_clz): Likewise.
(gfc_conv_intrinsic_si_kind): Likewise.
(gfc_conv_intrinsic_trim): Likewise.
(gfc_conv_intrinsic_iargc): Likewise.
Index: gcc/fortran/trans-intrinsic.c
===================================================================
*** gcc/fortran/trans-intrinsic.c (revision 115645)
--- gcc/fortran/trans-intrinsic.c (working copy)
*************** real_compnt_info;
*** 160,165 ****
--- 160,167 ----
/* Evaluate the arguments to an intrinsic function. */
+ /* FIXME: This function and its callers should be rewritten so that it's
+ not necessary to cons up a list to hold the arguments. */
static tree
gfc_conv_intrinsic_function_args (gfc_se * se, gfc_expr * expr)
*************** gfc_conv_intrinsic_ctime (gfc_se * se, g
*** 1077,1084 ****
/* Free the temporary afterwards, if necessary. */
cond = build2 (GT_EXPR, boolean_type_node, len,
build_int_cst (TREE_TYPE (len), 0));
! arglist = gfc_chainon_list (NULL_TREE, var);
! tmp = build_function_call_expr (gfor_fndecl_internal_free, arglist);
tmp = build3_v (COND_EXPR, cond, tmp, build_empty_stmt ());
gfc_add_expr_to_block (&se->post, tmp);
--- 1079,1085 ----
/* Free the temporary afterwards, if necessary. */
cond = build2 (GT_EXPR, boolean_type_node, len,
build_int_cst (TREE_TYPE (len), 0));
! tmp = build_call_expr (gfor_fndecl_internal_free, 1, var);
tmp = build3_v (COND_EXPR, cond, tmp, build_empty_stmt ());
gfc_add_expr_to_block (&se->post, tmp);
*************** gfc_conv_intrinsic_fdate (gfc_se * se, g
*** 1113,1120 ****
/* Free the temporary afterwards, if necessary. */
cond = build2 (GT_EXPR, boolean_type_node, len,
build_int_cst (TREE_TYPE (len), 0));
! arglist = gfc_chainon_list (NULL_TREE, var);
! tmp = build_function_call_expr (gfor_fndecl_internal_free, arglist);
tmp = build3_v (COND_EXPR, cond, tmp, build_empty_stmt ());
gfc_add_expr_to_block (&se->post, tmp);
--- 1114,1120 ----
/* Free the temporary afterwards, if necessary. */
cond = build2 (GT_EXPR, boolean_type_node, len,
build_int_cst (TREE_TYPE (len), 0));
! tmp = build_call_expr (gfor_fndecl_internal_free, 1, var);
tmp = build3_v (COND_EXPR, cond, tmp, build_empty_stmt ());
gfc_add_expr_to_block (&se->post, tmp);
*************** gfc_conv_intrinsic_ttynam (gfc_se * se,
*** 1151,1158 ****
/* Free the temporary afterwards, if necessary. */
cond = build2 (GT_EXPR, boolean_type_node, len,
build_int_cst (TREE_TYPE (len), 0));
! arglist = gfc_chainon_list (NULL_TREE, var);
! tmp = build_function_call_expr (gfor_fndecl_internal_free, arglist);
tmp = build3_v (COND_EXPR, cond, tmp, build_empty_stmt ());
gfc_add_expr_to_block (&se->post, tmp);
--- 1151,1157 ----
/* Free the temporary afterwards, if necessary. */
cond = build2 (GT_EXPR, boolean_type_node, len,
build_int_cst (TREE_TYPE (len), 0));
! tmp = build_call_expr (gfor_fndecl_internal_free, 1, var);
tmp = build3_v (COND_EXPR, cond, tmp, build_empty_stmt ());
gfc_add_expr_to_block (&se->post, tmp);
*************** gfc_conv_intrinsic_array_transfer (gfc_s
*** 2545,2559 ****
&& arg->expr->ref->u.ar.type == AR_FULL))
{
tmp = build_fold_addr_expr (argse.expr);
! tmp = gfc_chainon_list (NULL_TREE, tmp);
! source = build_function_call_expr (gfor_fndecl_in_pack, tmp);
source = gfc_evaluate_now (source, &argse.pre);
/* Free the temporary. */
gfc_start_block (&block);
tmp = convert (pvoid_type_node, source);
! tmp = gfc_chainon_list (NULL_TREE, tmp);
! tmp = build_function_call_expr (gfor_fndecl_internal_free, tmp);
gfc_add_expr_to_block (&block, tmp);
stmt = gfc_finish_block (&block);
--- 2544,2556 ----
&& arg->expr->ref->u.ar.type == AR_FULL))
{
tmp = build_fold_addr_expr (argse.expr);
! source = build_call_expr (gfor_fndecl_in_pack, 1, tmp);
source = gfc_evaluate_now (source, &argse.pre);
/* Free the temporary. */
gfc_start_block (&block);
tmp = convert (pvoid_type_node, source);
! tmp = build_call_expr (gfor_fndecl_internal_free, 1, tmp);
gfc_add_expr_to_block (&block, tmp);
stmt = gfc_finish_block (&block);
*************** gfc_conv_associated (gfc_se *se, gfc_exp
*** 2779,2785 ****
gfc_se arg2se;
tree tmp2;
tree tmp;
! tree args, fndecl;
gfc_ss *ss1, *ss2;
gfc_init_se (&arg1se, NULL);
--- 2776,2782 ----
gfc_se arg2se;
tree tmp2;
tree tmp;
! tree fndecl;
gfc_ss *ss1, *ss2;
gfc_init_se (&arg1se, NULL);
*************** gfc_conv_associated (gfc_se *se, gfc_exp
*** 2828,2844 ****
{
/* A pointer to an array, call library function _gfor_associated. */
gcc_assert (ss2 != gfc_ss_terminator);
- args = NULL_TREE;
arg1se.want_pointer = 1;
gfc_conv_expr_descriptor (&arg1se, arg1->expr, ss1);
- args = gfc_chainon_list (args, arg1se.expr);
arg2se.want_pointer = 1;
gfc_conv_expr_descriptor (&arg2se, arg2->expr, ss2);
gfc_add_block_to_block (&se->pre, &arg2se.pre);
gfc_add_block_to_block (&se->post, &arg2se.post);
- args = gfc_chainon_list (args, arg2se.expr);
fndecl = gfor_fndecl_associated;
! se->expr = build_function_call_expr (fndecl, args);
}
}
se->expr = convert (gfc_typenode_for_spec (&expr->ts), se->expr);
--- 2825,2838 ----
{
/* A pointer to an array, call library function _gfor_associated. */
gcc_assert (ss2 != gfc_ss_terminator);
arg1se.want_pointer = 1;
gfc_conv_expr_descriptor (&arg1se, arg1->expr, ss1);
arg2se.want_pointer = 1;
gfc_conv_expr_descriptor (&arg2se, arg2->expr, ss2);
gfc_add_block_to_block (&se->pre, &arg2se.pre);
gfc_add_block_to_block (&se->post, &arg2se.post);
fndecl = gfor_fndecl_associated;
! se->expr = build_call_expr (fndecl, 2, arg1se.expr, arg2se.expr);
}
}
se->expr = convert (gfc_typenode_for_spec (&expr->ts), se->expr);
*************** prepare_arg_info (gfc_se * se, gfc_expr
*** 2982,2988 ****
static tree
call_builtin_clz (tree result_type, tree op0)
{
! tree fn, parms, call;
enum machine_mode op0_mode = TYPE_MODE (TREE_TYPE (op0));
if (op0_mode == TYPE_MODE (integer_type_node))
--- 2976,2982 ----
static tree
call_builtin_clz (tree result_type, tree op0)
{
! tree fn, call;
enum machine_mode op0_mode = TYPE_MODE (TREE_TYPE (op0));
if (op0_mode == TYPE_MODE (integer_type_node))
*************** call_builtin_clz (tree result_type, tree
*** 2994,3001 ****
else
gcc_unreachable ();
! parms = tree_cons (NULL, op0, NULL);
! call = build_function_call_expr (fn, parms);
return convert (result_type, call);
}
--- 2988,2994 ----
else
gcc_unreachable ();
! call = build_call_expr (fn, 1, op0);
return convert (result_type, call);
}
*************** gfc_conv_intrinsic_si_kind (gfc_se * se,
*** 3116,3123 ****
args = gfc_conv_intrinsic_function_args (se, expr);
args = TREE_VALUE (args);
args = build_fold_addr_expr (args);
! args = tree_cons (NULL_TREE, args, NULL_TREE);
! se->expr = build_function_call_expr (gfor_fndecl_si_kind, args);
}
/* Generate code for SELECTED_REAL_KIND (P, R) intrinsic function. */
--- 3109,3115 ----
args = gfc_conv_intrinsic_function_args (se, expr);
args = TREE_VALUE (args);
args = build_fold_addr_expr (args);
! se->expr = build_call_expr (gfor_fndecl_si_kind, 1, args);
}
/* Generate code for SELECTED_REAL_KIND (P, R) intrinsic function. */
*************** gfc_conv_intrinsic_trim (gfc_se * se, gf
*** 3180,3187 ****
/* Free the temporary afterwards, if necessary. */
cond = build2 (GT_EXPR, boolean_type_node, len,
build_int_cst (TREE_TYPE (len), 0));
! arglist = gfc_chainon_list (NULL_TREE, var);
! tmp = build_function_call_expr (gfor_fndecl_internal_free, arglist);
tmp = build3_v (COND_EXPR, cond, tmp, build_empty_stmt ());
gfc_add_expr_to_block (&se->post, tmp);
--- 3172,3178 ----
/* Free the temporary afterwards, if necessary. */
cond = build2 (GT_EXPR, boolean_type_node, len,
build_int_cst (TREE_TYPE (len), 0));
! tmp = build_call_expr (gfor_fndecl_internal_free, 1, var);
tmp = build3_v (COND_EXPR, cond, tmp, build_empty_stmt ());
gfc_add_expr_to_block (&se->post, tmp);
*************** gfc_conv_intrinsic_iargc (gfc_se * se, g
*** 3234,3240 ****
/* Call the library function. This always returns an INTEGER(4). */
fndecl = gfor_fndecl_iargc;
! tmp = build_function_call_expr (fndecl, NULL_TREE);
/* Convert it to the required type. */
type = gfc_typenode_for_spec (&expr->ts);
--- 3225,3231 ----
/* Call the library function. This always returns an INTEGER(4). */
fndecl = gfor_fndecl_iargc;
! tmp = build_call_expr (fndecl, 0);
/* Convert it to the required type. */
type = gfc_typenode_for_spec (&expr->ts);