diff mbox

[Fortran,PR71807,v1,5/6/7,Regression] Internal compiler error with NULL() reference in structure constructor

Message ID 20160722172123.491564a0@vepi2
State New
Headers show

Commit Message

Andre Vehreschild July 22, 2016, 3:21 p.m. UTC 
Hi all,

committed to gcc-6-branch as r238649, and
to gcc-5-branch as r238650.

Regards,
	Andre

On Fri, 15 Jul 2016 11:29:37 +0200
Andre Vehreschild <vehre@gmx.de> wrote:

> Hi Jerry,
> 
> thanks for the fast review. Committed to trunk as r238368.
> 
> Regards,
> 	Andre
> 
> On Thu, 14 Jul 2016 10:49:37 -0700
> Jerry DeLisle <jvdelisle@charter.net> wrote:
> 
> > On 07/14/2016 09:17 AM, Andre Vehreschild wrote:  
> > > Hi all,
> > > 
> > > attached patch fixes the ICE when assigning null() to an
> > > allocatable component in an initializer.
> > > 
> > > Bootstrapped and regtested on x86_64-linux/F23 ok for trunk,
> > > gcc-6-branch and gcc-5-branch.
> > > 
> > > Ok for trunk and one week later for the other branches?
> > > 
> > > Regards,
> > > 	Andre
> > >     
> > 
> > Yes, OK and thanks for patch.
> > 
> > Jerry  
> 
>
diff mbox

Patch

Index: gcc/fortran/ChangeLog
===================================================================
--- gcc/fortran/ChangeLog	(Revision 238644)
+++ gcc/fortran/ChangeLog	(Arbeitskopie)
@@ -1,6 +1,13 @@ 
 2016-07-22  Andre Vehreschild  <vehre@gcc.gnu.org>
 
 	Backport from trunk:
+	PR fortran/71807
+	* trans-expr.c (gfc_trans_subcomponent_assign): Special casing
+	when allocatable component is set to null() in initializer.
+
+2016-07-22  Andre Vehreschild  <vehre@gcc.gnu.org>
+
+	Backport from trunk:
 	PR fortran/70842
 	* simplify.c (gfc_simplify_len): Only for unlimited polymorphic
 	types replace the expression's _data ref with a _len ref.
Index: gcc/fortran/trans-expr.c
===================================================================
--- gcc/fortran/trans-expr.c	(Revision 238643)
+++ gcc/fortran/trans-expr.c	(Arbeitskopie)
@@ -7012,6 +7012,12 @@ 
       tmp = gfc_trans_alloc_subarray_assign (tmp, cm, expr);
       gfc_add_expr_to_block (&block, tmp);
     }
+  else if (init && cm->attr.allocatable && expr->expr_type == EXPR_NULL)
+    {
+      /* NULL initialization for allocatable components.  */
+      gfc_add_modify (&block, dest, fold_convert (TREE_TYPE (dest),
+						  null_pointer_node));
+    }
   else if (init && (cm->attr.allocatable
 	   || (cm->ts.type == BT_CLASS && CLASS_DATA (cm)->attr.allocatable
 	       && expr->ts.type != BT_CLASS)))
Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog	(Revision 238644)
+++ gcc/testsuite/ChangeLog	(Arbeitskopie)
@@ -1,6 +1,12 @@ 
 2016-07-22  Andre Vehreschild  <vehre@gcc.gnu.org>
 
 	Backport from trunk:
+	PR fortran/71807
+	* gfortran.dg/null_9.f90: New test.
+
+2016-07-22  Andre Vehreschild  <vehre@gcc.gnu.org>
+
+	Backport from trunk:
 	PR fortran/70842
 	* gfortran.dg/select_type_35.f03: New test.
 
Index: gcc/testsuite/gfortran.dg/null_9.f90
===================================================================
--- gcc/testsuite/gfortran.dg/null_9.f90	(nicht existent)
+++ gcc/testsuite/gfortran.dg/null_9.f90	(Arbeitskopie)
@@ -0,0 +1,30 @@ 
+! { dg-do run }
+
+MODULE fold_convert_loc_ice
+  IMPLICIT NONE
+  PRIVATE
+
+  TYPE, PUBLIC :: ta
+    PRIVATE
+    INTEGER :: a_comp
+  END TYPE ta
+
+  TYPE, PUBLIC :: tb
+    TYPE(ta), ALLOCATABLE :: b_comp
+  END TYPE tb
+
+  PUBLIC :: proc
+CONTAINS
+  SUBROUTINE proc
+    TYPE(tb) :: b
+
+    b = tb(null())
+    if (allocated( b%b_comp )) call abort()
+  END SUBROUTINE proc
+END MODULE fold_convert_loc_ice
+
+  USE fold_convert_loc_ice
+
+  call proc()
+END
+