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

re PR fortran/29976 (ICE on optional arg) 

2006-11-28  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/29976
	* trans-expr.c (gfc_conv_missing_dummy): Remove build_int_const
	and replace with cast to type of se->expr of integer_zero_node.

2006-11-28  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/29976
	* gfortran.dg/missing_optional_dummy_3.f90

From-SVN: r119273
This commit is contained in:
Paul Thomas 2006-11-28 05:39:42 +00:00
parent 911a40abe0
commit 7523cace86
4 changed files with 45 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 @@
2006-11-28 Paul Thomas <pault@gcc.gnu.org>
PR fortran/29976
* trans-expr.c (gfc_conv_missing_dummy): Remove build_int_const
and replace with cast to type of se->expr of integer_zero_node.
2006-11-28 Paul Thomas <pault@gcc.gnu.org>
PR fortran/20880

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

@ -153,7 +153,8 @@ gfc_conv_missing_dummy (gfc_se * se, gfc_expr * arg, gfc_typespec ts)
present = gfc_conv_expr_present (arg->symtree->n.sym);
tmp = build3 (COND_EXPR, TREE_TYPE (se->expr), present, se->expr,
build_int_cst (TREE_TYPE (se->expr), 0));
fold_convert (TREE_TYPE (se->expr), integer_zero_node));
tmp = gfc_evaluate_now (tmp, &se->pre);
se->expr = tmp;
if (ts.type == BT_CHARACTER)

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2006-11-28 Paul Thomas <pault@gcc.gnu.org>
PR fortran/29976
* gfortran.dg/missing_optional_dummy_3.f90
2006-11-28 Paul Thomas <pault@gcc.gnu.org>
PR fortran/20880

32
gcc/testsuite/gfortran.dg/missing_optional_dummy_3.f90 Normal file
View File

@ -0,0 +1,32 @@
! { dg-do compile }
! Tests the fix for PR29976, in which the call to CMPLX caused an
! ICE with an optional dummy for the imaginary part.
!
! Contributed by Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
!
SUBROUTINE pw_sumup (alpha_im)
REAL, INTENT(in), OPTIONAL :: alpha_im
COMPLEX :: my_alpha_c
IF (PRESENT(alpha_im)) THEN
my_alpha_c = CMPLX(0.,alpha_im)
END IF
END SUBROUTINE pw_sumup
! Check non-intrinsic functions.
SUBROUTINE pw_sumup_2 (alpha_im)
REAL, INTENT(in), OPTIONAL :: alpha_im
COMPLEX :: my_alpha_c
IF (PRESENT(alpha_im)) THEN
my_alpha_c = MY_CMPLX(0.,alpha_im)
END IF
contains
complex function MY_CMPLX (re, im)
real, intent(in) :: re
real, intent(in), optional :: im
if (present (im)) then
MY_CMPLX = cmplx (re, im)
else
MY_CMPLX = cmplx (re, 0.0)
end if
end function MY_CMPLX
END SUBROUTINE pw_sumup_2