Hello,
The fix for PR61831 committed recently [1] introduced/uncovered a NULLL
pointer dereference with iso_varying_string, because a generic symbol
(which has a NULL result) is used as procedure symbol, instead of the
specific one.
Fixed by using esym if it's available.
Regression-tested on x86_64-linux. OK for trunk?
Mikael
[1]: https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01389.html
2015-07-20 Mikael Morin <mik...@gcc.gnu.org>
PR fortran/61831
PR fortran/66929
* trans-array.c (gfc_get_proc_ifc_for_expr): Use esym as procedure
symbol if available.
2015-07-20 Mikael Morin <mik...@gcc.gnu.org>
PR fortran/61831
PR fortran/66929
* gfortran.dg/generic_30.f90: New.
Index: trans-array.c
===================================================================
--- trans-array.c (révision 225979)
+++ trans-array.c (copie de travail)
@@ -9166,7 +9166,11 @@ gfc_get_proc_ifc_for_expr (gfc_expr *procedure_ref
return NULL;
/* Normal procedure case. */
- sym = procedure_ref->symtree->n.sym;
+ if (procedure_ref->expr_type == EXPR_FUNCTION
+ && procedure_ref->value.function.esym)
+ sym = procedure_ref->value.function.esym;
+ else
+ sym = procedure_ref->symtree->n.sym;
/* Typebound procedure case. */
for (ref = procedure_ref->ref; ref; ref = ref->next)
! { dg-do compile }
!
! PR fortran/66929
! Generic procedures as actual argument used to lead to
! a NULL pointer dereference in gfc_get_proc_ifc_for_expr
! because the generic symbol was used as procedure symbol,
! instead of the specific one.
module iso_varying_string
type, public :: varying_string
character(LEN=1), dimension(:), allocatable :: chars
end type varying_string
interface operator(/=)
module procedure op_ne_VS_CH
end interface operator (/=)
interface trim
module procedure trim_
end interface
contains
elemental function op_ne_VS_CH (string_a, string_b) result (op_ne)
type(varying_string), intent(in) :: string_a
character(LEN=*), intent(in) :: string_b
logical :: op_ne
op_ne = .true.
end function op_ne_VS_CH
elemental function trim_ (string) result (trim_string)
type(varying_string), intent(in) :: string
type(varying_string) :: trim_string
trim_string = varying_string(["t", "r", "i", "m", "m", "e", "d"])
end function trim_
end module iso_varying_string
module syntax_rules
use iso_varying_string, string_t => varying_string
contains
subroutine set_rule_type_and_key
type(string_t) :: key
if (trim (key) /= "") then
print *, "non-empty"
end if
end subroutine set_rule_type_and_key
end module syntax_rules
