OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/46794 (ICE on valid code involving power of small integer kinds) 

2010-12-09  Daniel Kraft  <d@domob.eu>

	PR fortran/46794
	* trans-expr.c (gfc_conv_power_op): Handle kind of result expression
	correctly for integer kind 1 and 2 operands.

2010-12-09  Daniel Kraft  <d@domob.eu>

	PR fortran/46794
	* gfortran.dg/power2.f90: New test.

From-SVN: r167644
This commit is contained in:
Daniel Kraft 2010-12-09 16:55:13 +01:00 committed by Daniel Kraft
parent 4f0c5578bf
commit cd441c9e1b
4 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View File

@ -1,3 +1,9 @@
2010-12-09 Daniel Kraft <d@domob.eu>
PR fortran/46794
* trans-expr.c (gfc_conv_power_op): Handle kind of result expression
correctly for integer kind 1 and 2 operands.
2010-12-09 Paul Thomas <pault@gcc.gnu.org>
PR fortran/45081

23
gcc/fortran/trans-expr.c
View File

@ -917,6 +917,7 @@ gfc_conv_power_op (gfc_se * se, gfc_expr * expr)
tree gfc_int4_type_node;
int kind;
int ikind;
int res_ikind_1, res_ikind_2;
gfc_se lse;
gfc_se rse;
tree fndecl;
@ -937,6 +938,13 @@ gfc_conv_power_op (gfc_se * se, gfc_expr * expr)
gfc_int4_type_node = gfc_get_int_type (4);
/* In case of integer operands with kinds 1 or 2, we call the integer kind 4
library routine. But in the end, we have to convert the result back
if this case applies -- with res_ikind_K, we keep track whether operand K
falls into this case. */
res_ikind_1 = -1;
res_ikind_2 = -1;
kind = expr->value.op.op1->ts.kind;
switch (expr->value.op.op2->ts.type)
{
@ -947,6 +955,7 @@ gfc_conv_power_op (gfc_se * se, gfc_expr * expr)
case 1:
case 2:
rse.expr = convert (gfc_int4_type_node, rse.expr);
res_ikind_2 = ikind;
/* Fall through. */
case 4:
@ -969,7 +978,10 @@ gfc_conv_power_op (gfc_se * se, gfc_expr * expr)
case 1:
case 2:
if (expr->value.op.op1->ts.type == BT_INTEGER)
lse.expr = convert (gfc_int4_type_node, lse.expr);
{
lse.expr = convert (gfc_int4_type_node, lse.expr);
res_ikind_1 = kind;
}
else
gcc_unreachable ();
/* Fall through. */
@ -1080,6 +1092,15 @@ gfc_conv_power_op (gfc_se * se, gfc_expr * expr)
}
se->expr = build_call_expr (fndecl, 2, lse.expr, rse.expr);
/* Convert the result back if it is of wrong integer kind. */
if (res_ikind_1 != -1 && res_ikind_2 != -1)
{
/* We want the maximum of both operand kinds as result. */
if (res_ikind_1 < res_ikind_2)
res_ikind_1 = res_ikind_2;
se->expr = convert (gfc_get_int_type (res_ikind_1), se->expr);
}
}

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2010-12-09 Daniel Kraft <d@domob.eu>
PR fortran/46794
* gfortran.dg/power2.f90: New test.
2010-12-09 Paul Thomas <pault@gcc.gnu.org>
PR fortran/45081

25
gcc/testsuite/gfortran.dg/power2.f90 Normal file
View File

@ -0,0 +1,25 @@
! { dg-do compile }
! PR fortran/46794
! Check that results of powers of integers with kinds 1 and 2 are
! correctly converted back; this used to ICE because a conversion
! from kind 4 to the correct one was missing.
! Contributed by Daniel Kraft, d@domob.eu.
PROGRAM main
IMPLICIT NONE
INTEGER(KIND=1) :: k1
INTEGER(KIND=2) :: k2
k1 = 1_1
k2 = 1_2
k1 = 1_1 + 1_1**k1
k2 = 1_2 + 1_2**k2
k2 = 1_1 + 1_1**k2
k2 = 1_1 + 1_2**k1
k2 = 1_1 + 1_2**k2
END PROGRAM main