Fix r225926's iso_varying_string ICE regression

	PR fortran/61831
	PR fortran/66929
gcc/fortran/
	* trans-array.c (gfc_get_proc_ifc_for_expr): Use esym as procedure
	symbol if available.
gcc/testsuite/
	* gfortran.dg/generic_30.f90: New.

From-SVN: r226074

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4c61b1ae0b55313c66823b6f3b549d39bbec4357..47cfa072aaaca642f9270e1c677ad3bb5d2ae129 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-22  Mikael Morin  <mikael@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-17  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/52846

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 1d5ddd0b68d047cbe7c4410549b4795f8ab7f311..c4cdbae1268c90c2ba616dd42e3d56f22c07fd4d 100644 (file)
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -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)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f4eb4c9f94c1afd031dc5f9a1b955febc05177a7..fef069d04be75c20d450432a33436593342ed238 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-22  Mikael Morin  <mikael@gcc.gnu.org>
+
+       PR fortran/61831
+       PR fortran/66929
+       * gfortran.dg/generic_30.f90: New.
+
 2015-07-22  Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/66952

diff --git a/gcc/testsuite/gfortran.dg/generic_30.f90 b/gcc/testsuite/gfortran.dg/generic_30.f90
new file mode 100644 (file)
index 0000000..5f82373
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/generic_30.f90
@@ -0,0 +1,41 @@
+! { 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