diff options
author | Harald Anlauf <anlauf@gmx.de> | 2022-03-01 23:13:17 +0100 |
---|---|---|
committer | Harald Anlauf <anlauf@gmx.de> | 2022-03-02 19:23:27 +0100 |
commit | 12463f1ecbcb30b39b8212454a6e598645123305 (patch) | |
tree | bf2f0be010efb094ae4ecd45078c6414d7c64c14 | |
parent | 38c1731193fe12d951f3010880406505507d90c1 (diff) | |
download | gcc-12463f1ecbcb30b39b8212454a6e598645123305.zip gcc-12463f1ecbcb30b39b8212454a6e598645123305.tar.gz gcc-12463f1ecbcb30b39b8212454a6e598645123305.tar.bz2 |
Fortran: error recovery after invalid assumed type declaration
gcc/fortran/ChangeLog:
PR fortran/104573
* resolve.cc (resolve_structure_cons): Avoid NULL pointer
dereference when there is no valid component.
gcc/testsuite/ChangeLog:
PR fortran/104573
* gfortran.dg/assumed_type_14.f90: New test.
-rw-r--r-- | gcc/fortran/resolve.cc | 10 | ||||
-rw-r--r-- | gcc/testsuite/gfortran.dg/assumed_type_14.f90 | 22 |
2 files changed, 29 insertions, 3 deletions
diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index 753aa27..0afa5d3 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -1288,15 +1288,19 @@ resolve_structure_cons (gfc_expr *expr, int init) } } - cons = gfc_constructor_first (expr->value.constructor); - /* A constructor may have references if it is the result of substituting a parameter variable. In this case we just pull out the component we want. */ if (expr->ref) comp = expr->ref->u.c.sym->components; - else + else if ((expr->ts.type == BT_DERIVED || expr->ts.type == BT_CLASS + || expr->ts.type == BT_UNION) + && expr->ts.u.derived) comp = expr->ts.u.derived->components; + else + return false; + + cons = gfc_constructor_first (expr->value.constructor); for (; comp && cons; comp = comp->next, cons = gfc_constructor_next (cons)) { diff --git a/gcc/testsuite/gfortran.dg/assumed_type_14.f90 b/gcc/testsuite/gfortran.dg/assumed_type_14.f90 new file mode 100644 index 0000000..112cde3 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/assumed_type_14.f90 @@ -0,0 +1,22 @@ +! { dg-do compile } +! PR fortran/104573 - ICE in resolve_structure_cons +! Contributed by G.Steinmetz +! Contributed by M.Morin + +program p + type t + end type + type(*), parameter :: x = t() ! { dg-error "Assumed type of variable" } + print *, x +end + +subroutine s + type t + integer :: a + end type + character(3), parameter :: x = t(2) ! { dg-error "Cannot convert" } + character(3), parameter :: y = x ! { dg-error "Unclassifiable statement" } + print *, y +end + +! { dg-prune-output "Cannot convert" } |