From 895e6dfa853f665e87eb759d7230abbf28676b46 Mon Sep 17 00:00:00 2001 From: burnus Date: Sun, 14 Mar 2010 13:18:28 +0000 Subject: [PATCH] 2010-03-14 Tobias Burnus PR fortran/43362 * resolve.c (resolve_structure_cons): Add missing PURE * constraint. (resolve_ordinary_assign): Add check to avoid segfault. 2010-03-14 Tobias Burnus PR fortran/43362 * gfortran.dg/impure_constructor_1.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157447 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 6 +++++ gcc/fortran/resolve.c | 11 ++++++++ gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gfortran.dg/impure_constructor_1.f90 | 30 ++++++++++++++++++++++ 4 files changed, 52 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/impure_constructor_1.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 9fd831d..dd809d9 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2010-03-14 Tobias Burnus + + PR fortran/43362 + * resolve.c (resolve_structure_cons): Add missing PURE constraint. + (resolve_ordinary_assign): Add check to avoid segfault. + 2010-03-12 Paul Thomas PR fortran/43291 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 9a95d34..774dfe4 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -921,6 +921,16 @@ resolve_structure_cons (gfc_expr *expr) "for pointer component '%s' should be a POINTER or " "a TARGET", &cons->expr->where, comp->name); } + + /* F2003, C1272 (3). */ + if (gfc_pure (NULL) && cons->expr->expr_type == EXPR_VARIABLE + && gfc_impure_variable (cons->expr->symtree->n.sym)) + { + t = FAILURE; + gfc_error ("Invalid expression in the derived type constructor for pointer " + "component '%s' at %L in PURE procedure", comp->name, + &cons->expr->where); + } } return t; @@ -7947,6 +7957,7 @@ resolve_ordinary_assign (gfc_code *code, gfc_namespace *ns) if (lhs->ts.type == BT_DERIVED && lhs->expr_type == EXPR_VARIABLE && lhs->ts.u.derived->attr.pointer_comp + && rhs->expr_type == EXPR_VARIABLE && gfc_impure_variable (rhs->symtree->n.sym)) { gfc_error ("The impure variable at %L is assigned to " diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 336e2e3..47a80da 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-03-14 Tobias Burnus + + PR fortran/43362 + * gfortran.dg/impure_constructor_1.f90: New test. + 2010-03-13 Sebastian Pop PR middle-end/43354 diff --git a/gcc/testsuite/gfortran.dg/impure_constructor_1.f90 b/gcc/testsuite/gfortran.dg/impure_constructor_1.f90 new file mode 100644 index 0000000..6657213 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/impure_constructor_1.f90 @@ -0,0 +1,30 @@ +! { dg-do compile } +! +! PR fortran/43362 +! +module m + implicit none + type t + integer, pointer :: a + end type t + type t2 + type(t) :: b + end type t2 + type t3 + type(t), pointer :: b + end type t3 +contains + pure subroutine foo(x) + type(t), target, intent(in) :: x + type(t2) :: y + type(t3) :: z + + ! The following gave an ICE but is valid: + y = t2(x) ! Note: F2003, C1272 (3) and (4) do not apply + + ! Variant which is invalid as C1272 (3) applies + z = t3(x) ! { dg-error "Invalid expression in the derived type constructor" } + end subroutine foo +end module m + + -- 2.7.4