aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorJanus Weil <janus@gcc.gnu.org>2012-07-31 15:03:53 +0200
committerJanus Weil <janus@gcc.gnu.org>2012-07-31 15:03:53 +0200
commit8539d639a863e52a59bad6ef6c7fbd7e80a4c042 (patch)
treed89feb8370f0f1f19d52dbd2d74516b16acdd884 /gcc/fortran
parent315bdf71bd62b8efd04c426a2be7d641cda8658e (diff)
downloadgcc-8539d639a863e52a59bad6ef6c7fbd7e80a4c042.zip
gcc-8539d639a863e52a59bad6ef6c7fbd7e80a4c042.tar.gz
gcc-8539d639a863e52a59bad6ef6c7fbd7e80a4c042.tar.bz2
re PR fortran/54134 ([OOP] ICE overriding derived type bound function with allocatable character as result)
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
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/dependency.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index fcd07f1..7eb4db4 100644
--- 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 108815a..ea1245d 100644
--- 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