git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR fortran/58593 (internal compiler error: in gfc_conv_string_tmp, at fortran/trans-expr.c:2360) 

2013-10-02  Tobias Burnus  <burnus@net-b.de>

        PR fortran/58593
        * trans-expr.c (gfc_conv_string_tmp): Fix obtaining
        the byte size of a single character.

2013-10-02  Tobias Burnus  <burnus@net-b.de>

        PR fortran/58593
        * gfortran.dg/char_length_19.f90: New.

From-SVN: r203135
This commit is contained in:
Tobias Burnus 2013-10-02 23:02:14 +02:00 committed by Tobias Burnus
parent 44d209d7e2
commit 9c84da22d5
4 changed files with 58 additions and 2 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 @@
2013-10-02 Tobias Burnus <burnus@net-b.de>
PR fortran/58593
* trans-expr.c (gfc_conv_string_tmp): Fix obtaining
the byte size of a single character.
2013-10-01 Tobias Burnus <burnus@net-b.de> 2013-10-01 Tobias Burnus <burnus@net-b.de>
PR fortran/58579 PR fortran/58579

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

@ -2357,8 +2357,9 @@ gfc_conv_string_tmp (gfc_se * se, tree type, tree len)
var = gfc_create_var (type, "pstr"); var = gfc_create_var (type, "pstr");
gcc_assert (POINTER_TYPE_P (type)); gcc_assert (POINTER_TYPE_P (type));
tmp = TREE_TYPE (type); tmp = TREE_TYPE (type);
gcc_assert (TREE_CODE (tmp) == ARRAY_TYPE); if (TREE_CODE (tmp) == ARRAY_TYPE)
tmp = TYPE_SIZE_UNIT (TREE_TYPE (tmp)); tmp = TREE_TYPE (tmp);
tmp = TYPE_SIZE_UNIT (tmp);
tmp = fold_build2_loc (input_location, MULT_EXPR, size_type_node, tmp = fold_build2_loc (input_location, MULT_EXPR, size_type_node,
fold_convert (size_type_node, len), fold_convert (size_type_node, len),
fold_convert (size_type_node, tmp)); fold_convert (size_type_node, tmp));

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2013-10-02 Tobias Burnus <burnus@net-b.de>
PR fortran/58593
* gfortran.dg/char_length_19.f90: New.
2013-10-02 Paolo Carlini <paolo.carlini@oracle.com> 2013-10-02 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58535 PR c++/58535

44
gcc/testsuite/gfortran.dg/char_length_19.f90 Normal file
View File

@ -0,0 +1,44 @@
! { dg-do compile }
!
! PR fortran/58579
!
! Contributed by Joost VandeVondele
!
! Was ICEing before due to the patch for PR 58593
!
subroutine test
CHARACTER(len=20) :: tmpStr
CHARACTER(len=20, kind=4) :: tmpStr4
INTEGER :: output_unit=6
WRITE (UNIT=output_unit,FMT="(T2,A,T61,A20)")&
"DFT| Self-interaction correction (SIC)",ADJUSTR(TRIM(tmpstr))
WRITE (UNIT=output_unit,FMT="(T2,A,T61,A20)")&
4_"DFT| Self-interaction correction (SIC)",ADJUSTR(TRIM(tmpstr4))
END
!
! PR fortran/58593
! Contributed by Albert Bartok
!
! The PR was overallocating memory. I placed it here to check for a
! variant of the test case above, which takes a slightly differnt code
! patch. Thus, its purpose is just to ensure that it won't ICE.
!
program test_char
implicit none
integer :: i
read*, i
print*, trim(test(i))
contains
function test(i)
integer, intent(in) :: i
character(len=i) :: test
test(1:1) = "A"
endfunction test
endprogram test_char