FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR fortran/64432 (SYSTEM_CLOCK(COUNT_RATE=rate) wrong result for integer(4)::rate)

Browse source 
2015-03-16  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR fortran/64432
	*trans-intrinisic.c (conv_intrinsic_system_clock): Check the
	smallest kind passed in user arguments and hardcode tesults for
	KIND=1 or KIND=2 to indicate no clock available.

From-SVN: r221471
This commit is contained in:
Jerry DeLisle 2015-03-17 01:01:54 +00:00
parent a5858a3dff
commit 65263c1f70
2 changed files with 101 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/fortran/ChangeLog
View file

@ -1,3 +1,10 @@
2015-03-16 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/64432
*trans-intrinisic.c (conv_intrinsic_system_clock): Check the
smallest kind passed in user arguments and hardcode tesults for
KIND=1 or KIND=2 to indicate no clock available.
2015-03-16 Andre Vehreschild <vehre@gmx.de> 2015-03-16 Andre Vehreschild <vehre@gmx.de>
* resolve.c: Prevent segfault on illegal input. * resolve.c: Prevent segfault on illegal input.

130
gcc/fortran/trans-intrinsic.c
View file

@ -2671,22 +2671,13 @@ conv_intrinsic_system_clock (gfc_code *code)
stmtblock_t block; stmtblock_t block;
gfc_se count_se, count_rate_se, count_max_se; gfc_se count_se, count_rate_se, count_max_se;
tree arg1 = NULL_TREE, arg2 = NULL_TREE, arg3 = NULL_TREE; tree arg1 = NULL_TREE, arg2 = NULL_TREE, arg3 = NULL_TREE;
tree type, tmp; tree tmp;
int kind; int least;
gfc_expr *count = code->ext.actual->expr; gfc_expr *count = code->ext.actual->expr;
gfc_expr *count_rate = code->ext.actual->next->expr; gfc_expr *count_rate = code->ext.actual->next->expr;
gfc_expr *count_max = code->ext.actual->next->next->expr; gfc_expr *count_max = code->ext.actual->next->next->expr;
/* The INTEGER(8) version has higher precision, it is used if both COUNT
and COUNT_MAX can hold 64-bit values, or are absent. */
if ((!count || count->ts.kind >= 8)
&& (!count_max || count_max->ts.kind >= 8))
kind = 8;
else
kind = gfc_default_integer_kind;
type = gfc_get_int_type (kind);
/* Evaluate our arguments. */ /* Evaluate our arguments. */
if (count) if (count)
{ {
@ -2706,36 +2697,103 @@ conv_intrinsic_system_clock (gfc_code *code)
gfc_conv_expr (&count_max_se, count_max); gfc_conv_expr (&count_max_se, count_max);
} }
/* Prepare temporary variables if we need them. */ /* Find the smallest kind found of the arguments. */
if (count && count->ts.kind != kind) least = 16;
arg1 = gfc_create_var (type, "count"); least = (count && count->ts.kind < least) ? count->ts.kind : least;
else if (count) least = (count_rate && count_rate->ts.kind < least) ? count_rate->ts.kind
arg1 = count_se.expr; : least;
least = (count_max && count_max->ts.kind < least) ? count_max->ts.kind
: least;
if (count_rate && (count_rate->ts.kind != kind /* Prepare temporary variables. */
|| count_rate->ts.type != BT_INTEGER))
arg2 = gfc_create_var (type, "count_rate");
else if (count_rate)
arg2 = count_rate_se.expr;
if (count_max && count_max->ts.kind != kind) if (count)
arg3 = gfc_create_var (type, "count_max"); {
else if (count_max) if (least >= 8)
arg3 = count_max_se.expr; arg1 = gfc_create_var (gfc_get_int_type (8), "count");
else if (least == 4)
arg1 = gfc_create_var (gfc_get_int_type (4), "count");
else if (count->ts.kind == 1)
arg1 = gfc_conv_mpz_to_tree (gfc_integer_kinds[0].pedantic_min_int,
count->ts.kind);
else
arg1 = gfc_conv_mpz_to_tree (gfc_integer_kinds[1].pedantic_min_int,
count->ts.kind);
}
if (count_rate)
{
if (least >= 8)
arg2 = gfc_create_var (gfc_get_int_type (8), "count_rate");
else if (least == 4)
arg2 = gfc_create_var (gfc_get_int_type (4), "count_rate");
else
arg2 = integer_zero_node;
}
if (count_max)
{
if (least >= 8)
arg3 = gfc_create_var (gfc_get_int_type (8), "count_max");
else if (least == 4)
arg3 = gfc_create_var (gfc_get_int_type (4), "count_max");
else
arg3 = integer_zero_node;
}
/* Make the function call. */ /* Make the function call. */
gfc_init_block (&block); gfc_init_block (&block);
tmp = build_call_expr_loc (input_location,
kind == 4 ? gfor_fndecl_system_clock4 if (least <= 2)
: gfor_fndecl_system_clock8, {
3, if (least == 1)
arg1 ? gfc_build_addr_expr (NULL_TREE, arg1) {
: null_pointer_node, arg1 ? gfc_build_addr_expr (NULL_TREE, arg1)
arg2 ? gfc_build_addr_expr (NULL_TREE, arg2) : null_pointer_node;
: null_pointer_node, arg2 ? gfc_build_addr_expr (NULL_TREE, arg2)
arg3 ? gfc_build_addr_expr (NULL_TREE, arg3) : null_pointer_node;
: null_pointer_node); arg3 ? gfc_build_addr_expr (NULL_TREE, arg3)
gfc_add_expr_to_block (&block, tmp); : null_pointer_node;
}
if (least == 2)
{
arg1 ? gfc_build_addr_expr (NULL_TREE, arg1)
: null_pointer_node;
arg2 ? gfc_build_addr_expr (NULL_TREE, arg2)
: null_pointer_node;
arg3 ? gfc_build_addr_expr (NULL_TREE, arg3)
: null_pointer_node;
}
}
else
{
if (least == 4)
{
tmp = build_call_expr_loc (input_location,
gfor_fndecl_system_clock4, 3,
arg1 ? gfc_build_addr_expr (NULL_TREE, arg1)
: null_pointer_node,
arg2 ? gfc_build_addr_expr (NULL_TREE, arg2)
: null_pointer_node,
arg3 ? gfc_build_addr_expr (NULL_TREE, arg3)
: null_pointer_node);
gfc_add_expr_to_block (&block, tmp);
}
/* Handle kind>=8, 10, or 16 arguments */
if (least >= 8)
{
tmp = build_call_expr_loc (input_location,
gfor_fndecl_system_clock8, 3,
arg1 ? gfc_build_addr_expr (NULL_TREE, arg1)
: null_pointer_node,
arg2 ? gfc_build_addr_expr (NULL_TREE, arg2)
: null_pointer_node,
arg3 ? gfc_build_addr_expr (NULL_TREE, arg3)
: null_pointer_node);
gfc_add_expr_to_block (&block, tmp);
}
}
/* And store values back if needed. */ /* And store values back if needed. */
if (arg1 && arg1 != count_se.expr) if (arg1 && arg1 != count_se.expr)