diff options
| author | Tobias Burnus <burnus@net-b.de> | 2012-03-03 19:55:57 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2012-03-03 19:55:57 +0100 |
| commit | 6230987eebe7fc0e2f631c41fc92a40795acad77 (patch) | |
| tree | 23576630ebdb4add80a99df87ee7037ac84ad024 | |
| parent | a6de595f94a9a1956f19124195b0c852fd9fde73 (diff) | |
| download | gcc-6230987eebe7fc0e2f631c41fc92a40795acad77.zip gcc-6230987eebe7fc0e2f631c41fc92a40795acad77.tar.gz gcc-6230987eebe7fc0e2f631c41fc92a40795acad77.tar.bz2 | |
re PR fortran/48820 (TR 29113: Implement parts needed for MPI 3)
2012-03-03 Tobias Burnus <burnus@net-b.de>
PR fortran/48820
* resolve.c (resolve_actual_arglist): Properly reset
assumed_type_expr_allowed.
2012-03-03 Tobias Burnus <burnus@net-b.de>
PR fortran/48820
* gfortran.dg/assumed_type_3.f90: Undo previous commit.
From-SVN: r184863
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/assumed_type_3.f90 | 10 |
4 files changed, 16 insertions, 7 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index f488afc..0234bed 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2012-03-03 Tobias Burnus <burnus@net-b.de> + PR fortran/48820 + * resolve.c (resolve_actual_arglist): Properly reset + assumed_type_expr_allowed. + +2012-03-03 Tobias Burnus <burnus@net-b.de> + * lang.opt (Wc-binding-type): New flag. * options.c (gfc_init_options, gfc_handle_option): Handle it. * invoke.texi (Wc-binding-type): Document it. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 618c6f5..b63a0c6 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -1833,7 +1833,7 @@ resolve_actual_arglist (gfc_actual_arglist *arg, procedure_type ptype, return FAILURE; } } - assumed_type_expr_allowed = true; + assumed_type_expr_allowed = false; return SUCCESS; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a4275d9..090be61 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2012-03-03 Tobias Burnus <burnus@net-b.de> + PR fortran/48820 + * gfortran.dg/assumed_type_3.f90: Undo previous commit. + +2012-03-03 Tobias Burnus <burnus@net-b.de> + * gfortran.dg/bind_c_dts_4.f03: Add dg-options -Wc-binding-type. * gfortran.dg/bind_c_implicit_vars.f03: Ditto. * gfortran.dg/bind_c_usage_8.f03: Ditto. diff --git a/gcc/testsuite/gfortran.dg/assumed_type_3.f90 b/gcc/testsuite/gfortran.dg/assumed_type_3.f90 index 15619ce..d88da34 100644 --- a/gcc/testsuite/gfortran.dg/assumed_type_3.f90 +++ b/gcc/testsuite/gfortran.dg/assumed_type_3.f90 @@ -5,11 +5,6 @@ ! ! Test TYPE(*) -subroutine fourteen(x) - type(*) :: x - x = x ! { dg-error "Invalid expression with assumed-type variable" } -end subroutine fourteen - subroutine one(a) ! { dg-error "may not have the ALLOCATABLE, CODIMENSION, POINTER or VALUE attribute" } type(*), value :: a end subroutine one @@ -118,4 +113,7 @@ subroutine thirteen(x, y) print *, ubound(y, dim=x) ! { dg-error "must be INTEGER" } end subroutine thirteen - +subroutine fourteen(x) + type(*) :: x + x = x ! { dg-error "Invalid expression with assumed-type variable" } +end subroutine fourteen |