re PR fortran/57033 (ICE on extended derived type and default initialization)

fortran/
        PR fortran/57033
        * primary.c (gfc_convert_to_structure_constructor): Avoid null pointer
        dereference.

testsuite/
        PR fortran/57033
        * gfortran.dg/default_initialization_7.f90: New test.

From-SVN: r207634

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 029a23f2f834b1bae30534380eb0e3622b115986..cd277aa3a26e72566c5f16e5113a73ae1168fbfb 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-08  Mikael Morin  <mikael@gcc.gnu.org>
+
+       PR fortran/57033
+       * primary.c (gfc_convert_to_structure_constructor): Avoid null pointer
+       dereference.
+
 2014-02-07  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/59906

diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
index db288b59a85787158b31237f8fc1763c567246c3..a94ae216dd5d0a078c041f2afc770c9ac1189878 100644 (file)
--- a/gcc/fortran/primary.c
+++ b/gcc/fortran/primary.c
@@ -2540,7 +2540,8 @@ gfc_convert_to_structure_constructor (gfc_expr *e, gfc_symbol *sym, gfc_expr **c
       if (parent && !comp)
        break;
 
-      actual = actual->next;
+      if (actual)
+       actual = actual->next;
     }
 
   if (build_actual_constructor (&comp_head, &ctor_head, sym) == FAILURE)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 11a388acf3aa3b801c6c3181fe83c462d136585b..4a33d938c40f2827ef56f1cd24ecdaa8faaf0c86 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-08  Mikael Morin  <mikael@gcc.gnu.org>
+
+       PR fortran/57033
+       * gfortran.dg/default_initialization_7.f90: New test.
+
 2014-02-07  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/59906

diff --git a/gcc/testsuite/gfortran.dg/default_initialization_7.f90 b/gcc/testsuite/gfortran.dg/default_initialization_7.f90
new file mode 100644 (file)
index 0000000..fc8be98
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/default_initialization_7.f90
@@ -0,0 +1,22 @@
+! { dg-do compile }
+!
+! PR fortran/57033
+! ICE on a structure constructor of an extended derived type whose parent
+! type last component has a default initializer
+!
+! Contributed by Tilo Schwarz <tilo@tilo-schwarz.de>
+
+program ice
+
+type m
+    integer i
+    logical :: f = .false.
+end type m
+
+type, extends(m) :: me
+end type me
+
+type(me) meo
+
+meo = me(1)              ! ICE
+end program ice