re PR fortran/54134 ([OOP] ICE overriding derived type bound function with allocatabl...

2012-07-31  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/54134
	* dependency.c (gfc_dep_compare_expr): Check if arguments are NULL.

2012-07-31  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/54134
	* gfortran.dg/typebound_override_3.f90: New.

From-SVN: r190010

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index fcd07f1b59ec2a226e3ca467bfa7b75eb8961d40..7eb4db4b2aadf46c66166c33d19981c682bf9e1e 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-31  Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/54134
+       * dependency.c (gfc_dep_compare_expr): Check if arguments are NULL.
+
 2012-07-31  Tobias Burnus  <burnus@net-b.de>
 
        * interface.c (gfc_procedure_use): Return gfc_try instead of void.

diff --git a/gcc/fortran/dependency.c b/gcc/fortran/dependency.c
index 108815a44d9400b08b3802b6ad1f5a882f967232..ea1245dbb0b702b06649d9c04e5fa14f38d338d5 100644 (file)
--- a/gcc/fortran/dependency.c
+++ b/gcc/fortran/dependency.c
@@ -261,6 +261,9 @@ gfc_dep_compare_expr (gfc_expr *e1, gfc_expr *e2)
   n1 = NULL;
   n2 = NULL;
 
+  if (e1 == NULL && e2 == NULL)
+    return 0;
+
   /* Remove any integer conversion functions to larger types.  */
   if (e1->expr_type == EXPR_FUNCTION && e1->value.function.isym
       && e1->value.function.isym->id == GFC_ISYM_CONVERSION

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bfbf597ec489cf011b1f8a008db4abd0bd4fab18..6a56342c018d678ae79d880e8d98e8568d8dde93 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-31  Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/54134
+       * gfortran.dg/typebound_override_3.f90: New.
+
 2012-07-31  Bill Schmidt  <wschmidt@linux.ibm.com>
 
        PR tree-optimization/53773

diff --git a/gcc/testsuite/gfortran.dg/typebound_override_3.f90 b/gcc/testsuite/gfortran.dg/typebound_override_3.f90
new file mode 100644 (file)
index 0000000..36d8473
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/typebound_override_3.f90
@@ -0,0 +1,34 @@
+! { dg-do compile }
+!
+! PR 54134: [OOP] ICE overriding derived type bound function with allocatable character as result
+!
+! Contributed by <koen.poppe@cs.kuleuven.be>
+
+module dtAs
+  implicit none
+  type :: A
+  contains
+    procedure, nopass :: name => name_A
+  end type
+contains
+  function name_A() result( name )
+    character(:), allocatable :: name 
+    name = "name_A"
+  end function
+end module
+
+module dtBs
+  use dtAs
+  implicit none
+  type, extends( A ) :: B
+  contains
+    procedure, nopass :: name => name_B
+  end type
+contains
+  function name_B() result( name )
+    character(:), allocatable :: name 
+    name = "name_B"
+  end function
+end module
+
+! { dg-final { cleanup-modules "dtAs dtBs" } }