diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2016-11-08 23:07:21 +0100 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2016-11-08 23:07:21 +0100 |
| commit | 103c4f759ab75305a7cb7927af6b35b1f5da5f06 (patch) | |
| tree | bca188b5b0956cce33dabe41bbc1bc121c18c073 | |
| parent | fe7913f6887eaa6f5cdb150bd5315f8464d06beb (diff) | |
| download | gcc-103c4f759ab75305a7cb7927af6b35b1f5da5f06.zip gcc-103c4f759ab75305a7cb7927af6b35b1f5da5f06.tar.gz gcc-103c4f759ab75305a7cb7927af6b35b1f5da5f06.tar.bz2 | |
re PR fortran/68440 ([OOP] ICE on declaring class variable with wrong attribute)
2016-11-08 Janus Weil <janus@gcc.gnu.org>
PR fortran/68440
* expr.c (check_alloc_comp_init): Loosen an assert.
* resolve.c (resolve_fl_parameter): Reject class parameters.
2016-11-08 Janus Weil <janus@gcc.gnu.org>
PR fortran/68440
* gfortran.dg/class_58.f90: New test.
From-SVN: r241979
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/class_58.f90 | 13 |
5 files changed, 34 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index d3c1699..499c3d4 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2016-11-08 Janus Weil <janus@gcc.gnu.org> + PR fortran/68440 + * expr.c (check_alloc_comp_init): Loosen an assert. + * resolve.c (resolve_fl_parameter): Reject class parameters. + +2016-11-08 Janus Weil <janus@gcc.gnu.org> + PR fortran/77596 * expr.c (gfc_check_pointer_assign): Add special check for procedure- pointer component with absent interface. diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index f059c3c..b2ffaae 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -2206,7 +2206,7 @@ check_alloc_comp_init (gfc_expr *e) gfc_constructor *ctor; gcc_assert (e->expr_type == EXPR_STRUCTURE); - gcc_assert (e->ts.type == BT_DERIVED); + gcc_assert (e->ts.type == BT_DERIVED || e->ts.type == BT_CLASS); for (comp = e->ts.u.derived->components, ctor = gfc_constructor_first (e->value.constructor); diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 3a4dd1f..f4d346e 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -14001,6 +14001,15 @@ resolve_fl_parameter (gfc_symbol *sym) &sym->value->where); return false; } + + /* F03:C509,C514. */ + if (sym->ts.type == BT_CLASS) + { + gfc_error ("CLASS variable %qs at %L cannot have the PARAMETER attribute", + sym->name, &sym->declared_at); + return false; + } + return true; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 05159aa..2b561e8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-11-08 Janus Weil <janus@gcc.gnu.org> + + PR fortran/68440 + * gfortran.dg/class_58.f90: New test. + 2016-11-08 Uros Bizjak <ubizjak@gmail.com> PR target/70799 diff --git a/gcc/testsuite/gfortran.dg/class_58.f90 b/gcc/testsuite/gfortran.dg/class_58.f90 new file mode 100644 index 0000000..20b601a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/class_58.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } +! +! PR 68440: [OOP] ICE on declaring class variable with wrong attribute +! +! Contributed by Gerhard Steinmetz <gerhard.steinmetz.fortran@t-online.de> + +subroutine s + type t + end type + class(t), parameter :: x = t() ! { dg-error "cannot have the PARAMETER attribute" } + class(t), parameter :: y = x ! { dg-error "cannot have the PARAMETER attribute" } + class(t) :: z = x ! { dg-error "must be dummy, allocatable or pointer" } +end |