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

re PR fortran/31725 ([4.1 only] substring bound evaluated multiple times: wrong code for string(function():) = 'X')

Browse source 
PR fortran/31725

	* trans-expr.c (gfc_conv_substring): Evaluate substring bounds
	only once.

	* gfortran.dg/substr_4.f: New test.

From-SVN: r124720
This commit is contained in:
François-Xavier Coudert 2007-05-14 19:29:33 +00:00
parent 9c40feebdb
commit 1af5627c40
4 changed files with 88 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 @@
2007-05-14 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR fortran/31725
* trans-expr.c (gfc_conv_substring): Evaluate substring bounds
only once.
2007-05-14 Rafael Avila de Espindola <espindola@google.com>
* f95-lang.c (LANG_HOOKS_UNSIGNED_TYPE): Remove.

7
gcc/fortran/trans-expr.c
View file

@ -261,6 +261,10 @@ gfc_conv_substring (gfc_se * se, gfc_ref * ref, int kind,
gfc_conv_string_parameter (se);
else
{
/* Avoid multiple evaluation of substring start. */
if (!CONSTANT_CLASS_P (start.expr) && !DECL_P (start.expr))
start.expr = gfc_evaluate_now (start.expr, &se->pre);
/* Change the start of the string. */
if (TYPE_STRING_FLAG (TREE_TYPE (se->expr)))
tmp = se->expr;
@ -279,6 +283,9 @@ gfc_conv_substring (gfc_se * se, gfc_ref * ref, int kind,
gfc_conv_expr_type (&end, ref->u.ss.end, gfc_charlen_type_node);
gfc_add_block_to_block (&se->pre, &end.pre);
}
if (!CONSTANT_CLASS_P (end.expr) && !DECL_P (end.expr))
end.expr = gfc_evaluate_now (end.expr, &se->pre);
if (flag_bounds_check)
{
tree nonempty = fold_build2 (LE_EXPR, boolean_type_node,

7
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2007-05-14 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR fortran/31725
* gfortran.dg/substr_4.f: New test.
2007-05-14 Kazu Hirata <kazu@codesourcery.com>
* gcc.target/m68k/interrupt_thread-1.c,
@ -5,7 +10,7 @@
gcc.target/m68k/interrupt_thread-3.c: New.
* gcc.target/m68k/m68k.exp: Accept fido.
2007-05-13 Dominique d'Humières <dominiq@lps.ens.fr>
2007-05-13 Dominique d'Humieres <dominiq@lps.ens.fr>
* alloc_comp_basics_1.f90: Fix dg directive.
* altreturn_3.f90: Likewise.

69
gcc/testsuite/gfortran.dg/substr_4.f Normal file
View file

@ -0,0 +1,69 @@
! { dg-do run }
subroutine test_lower
implicit none
character(3), dimension(3) :: zsymel,zsymelr
common /xx/ zsymel, zsymelr
integer :: znsymelr
zsymel = (/ 'X', 'Y', ' ' /)
zsymelr= (/ 'X', 'Y', ' ' /)
znsymelr=2
call check_zsymel(zsymel,zsymelr,znsymelr)
contains
subroutine check_zsymel(zsymel,zsymelr,znsymelr)
implicit none
integer znsymelr, isym
character(*) zsymel(*),zsymelr(*)
character(len=80) buf
zsymel(3)(lenstr(zsymel(3))+1:)='X'
write (buf,10) (trim(zsymelr(isym)),isym=1,znsymelr)
10 format(3(a,:,','))
if (trim(buf) /= 'X,Y') call abort
end subroutine check_zsymel
function lenstr(s)
character(len=*),intent(in) :: s
integer :: lenstr
if (len_trim(s) /= 0) call abort
lenstr = len_trim(s)
end function lenstr
end subroutine test_lower
subroutine test_upper
implicit none
character(3), dimension(3) :: zsymel,zsymelr
common /xx/ zsymel, zsymelr
integer :: znsymelr
zsymel = (/ 'X', 'Y', ' ' /)
zsymelr= (/ 'X', 'Y', ' ' /)
znsymelr=2
call check_zsymel(zsymel,zsymelr,znsymelr)
contains
subroutine check_zsymel(zsymel,zsymelr,znsymelr)
implicit none
integer znsymelr, isym
character(*) zsymel(*),zsymelr(*)
character(len=80) buf
zsymel(3)(:lenstr(zsymel(3))+1)='X'
write (buf,20) (trim(zsymelr(isym)),isym=1,znsymelr)
20 format(3(a,:,','))
if (trim(buf) /= 'X,Y') call abort
end subroutine check_zsymel
function lenstr(s)
character(len=*),intent(in) :: s
integer :: lenstr
if (len_trim(s) /= 0) call abort
lenstr = len_trim(s)
end function lenstr
end subroutine test_upper
program test
call test_lower
call test_upper
end program test