From 8801653208ef13e4762d907971e3a6b83a8e721e Mon Sep 17 00:00:00 2001 From: Jerry DeLisle Date: Wed, 28 Jun 2017 02:17:40 +0000 Subject: [PATCH] re PR fortran/80164 (ICE in gfc_format_decoder at gcc/fortran/error.c:933) 2017-06-27 Jerry DeLisle PR fortran/80164 * trans-stmt.c (gfc_trans_call): If no code expr, use code->loc as warning/error locus. * gfortran.dg/array_temporaries_4.f90: New test. From-SVN: r249718 --- gcc/fortran/ChangeLog | 6 ++ gcc/fortran/trans-stmt.c | 6 +- gcc/testsuite/ChangeLog | 5 ++ .../gfortran.dg/array_temporaries_4.f90 | 59 +++++++++++++++++++ 4 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/array_temporaries_4.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 88fd0b327d7..fbf0b4ded40 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2017-06-27 Jerry DeLisle + + PR fortran/80164 + * trans-stmt.c (gfc_trans_call): If no code expr, use code->loc + as warning/error locus. + 2017-06-24 Jerry DeLisle PR fortran/81160 diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index e4f1da54ac7..a1e1dff72e0 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -452,7 +452,11 @@ gfc_trans_call (gfc_code * code, bool dependency_check, subscripts. This could be prevented in the elemental case as temporaries are handled separatedly (below in gfc_conv_elemental_dependencies). */ - gfc_conv_loop_setup (&loop, &code->expr1->where); + if (code->expr1) + gfc_conv_loop_setup (&loop, &code->expr1->where); + else + gfc_conv_loop_setup (&loop, &code->loc); + gfc_mark_ss_chain_used (ss, 1); /* Convert the arguments, checking for dependencies. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 56123195e8d..46879b7998d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-06-27 Jerry DeLisle + + PR fortran/80164 + * gfortran.dg/array_temporaries_4.f90: New test. + 2017-06-27 Andrew Pinski * gcc.dg/tree-ssa/copy-sign-1.c: New testcase. diff --git a/gcc/testsuite/gfortran.dg/array_temporaries_4.f90 b/gcc/testsuite/gfortran.dg/array_temporaries_4.f90 new file mode 100644 index 00000000000..d022ce88557 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/array_temporaries_4.f90 @@ -0,0 +1,59 @@ +! { dg-do compile } +! { dg-options "-Warray-temporaries" } +! Tests the fix for PR80164, in which the compiler segfaulted on this +! when using -Warray-temporaries +! +!****************************************************************************** +module global + type :: a + integer :: b + character(8):: c + end type a + interface assignment(=) + module procedure a_to_a, c_to_a, a_to_c + end interface + interface operator(.ne.) + module procedure a_ne_a + end interface + + type(a) :: x(4), y(4) + logical :: l1(4), t = .true., f= .false. +contains +!****************************************************************************** + elemental subroutine a_to_a (m, n) + type(a), intent(in) :: n + type(a), intent(out) :: m + m%b = len ( trim(n%c)) + m%c = n%c + end subroutine a_to_a + elemental subroutine c_to_a (m, n) + character(8), intent(in) :: n + type(a), intent(out) :: m + m%b = m%b + 1 + m%c = n + end subroutine c_to_a + elemental subroutine a_to_c (m, n) + type(a), intent(in) :: n + character(8), intent(out) :: m + m = n%c + end subroutine a_to_c +!****************************************************************************** + elemental logical function a_ne_a (m, n) + type(a), intent(in) :: n + type(a), intent(in) :: m + a_ne_a = (m%b .ne. n%b) .or. (m%c .ne. n%c) + end function a_ne_a +!****************************************************************************** + elemental function foo (m) + type(a) :: foo + type(a), intent(in) :: m + foo%b = 0 + foo%c = m%c + end function foo +end module global +!****************************************************************************** +program test + use global + x = (/a (0, "one"),a (0, "two"),a (0, "three"),a (0, "four")/) ! { dg-warning "Creating array temporary" } + y = x +end program test -- 2.30.2