From: Janus Weil <janus@gcc.gnu.org>
Date: Thu, 7 Nov 2013 22:39:15 +0000 (+0100)
Subject: re PR fortran/58471 (ICE on invalid with missing type constructor and -Wall)
X-Git-Tag: releases/gcc-4.9.0~2938
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50c7654b96ef45499bdde32d5a0acd097a911ece;p=thirdparty%2Fgcc.git

re PR fortran/58471 (ICE on invalid with missing type constructor and -Wall)

2013-11-07  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/58471
	* primary.c (gfc_expr_attr): Check for result symbol.

2013-11-07  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/58471
	* gfortran.dg/constructor_9.f90: New.

From-SVN: r204547
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index c7096219a268..8e2e10c8539b 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-07  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/58471
+	* primary.c (gfc_expr_attr): Check for result symbol.
+
 2013-11-06  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	* gfortran.texi: Fix typo.
diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
index 80d45eaea12e..c9a26b09be41 100644
--- a/gcc/fortran/primary.c
+++ b/gcc/fortran/primary.c
@@ -2258,7 +2258,7 @@ gfc_expr_attr (gfc_expr *e)
     case EXPR_FUNCTION:
       gfc_clear_attr (&attr);
 
-      if (e->value.function.esym != NULL)
+      if (e->value.function.esym && e->value.function.esym->result)
 	{
 	  gfc_symbol *sym = e->value.function.esym->result;
 	  attr = sym->attr;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0e850816bfa4..e83d64e4dbdd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-07  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/58471
+	* gfortran.dg/constructor_9.f90: New.
+
 2013-11-07  Joseph Myers  <joseph@codesourcery.com>
 
 	* gcc.dg/atomic-compare-exchange-1.c,
diff --git a/gcc/testsuite/gfortran.dg/constructor_9.f90 b/gcc/testsuite/gfortran.dg/constructor_9.f90
new file mode 100644
index 000000000000..5196703031a8
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/constructor_9.f90
@@ -0,0 +1,22 @@
+! { dg-do compile }
+! { dg-options "-Wall" }
+!
+! PR 58471: [4.8/4.9 Regression] ICE on invalid with missing type constructor and -Wall
+!
+! Contributed by Andrew Benson <abensonca@gmail.com>
+
+module cf
+  implicit none
+  type :: cfmde
+  end type
+  interface cfmde
+     module procedure mdedc   ! { dg-error "is neither function nor subroutine" }
+  end interface
+contains
+  subroutine cfi()
+    type(cfmde), pointer :: cfd
+    cfd=cfmde()                  ! { dg-error "Can't convert" }
+  end subroutine
+end module
+
+! { dg-final { cleanup-modules "cf" } }