diff options
| author | Tobias Burnus <burnus@net-b.de> | 2011-06-20 23:12:39 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2011-06-20 23:12:39 +0200 |
| commit | fea549356d388607081f1a83ebac557259314d62 (patch) | |
| tree | 712d69e7e3f4057ac1970712cd75e6aca85eeb88 /gcc/fortran/expr.c | |
| parent | 998c75b661fa518b79a33f523eb716c246cba756 (diff) | |
| download | gcc-fea549356d388607081f1a83ebac557259314d62.zip gcc-fea549356d388607081f1a83ebac557259314d62.tar.gz gcc-fea549356d388607081f1a83ebac557259314d62.tar.bz2 | |
re PR fortran/18918 (Eventually support Fortran 2008's coarrays [co-arrays])
2011-06-20 Tobias Burnus <burnus@net-b.de>
PR fortran/18918
* gfortran.h (gfc_check_vardef_context): Update prototype.
(iso_fortran_env_symbol): Handle derived types.
(symbol_attribute): Add lock_comp.
* expr.c (gfc_check_vardef_context): Add LOCK_TYPE check.
* interface.c (compare_parameter, gfc_procedure_use): Handle
LOCK_TYPE.
(compare_actual_formal): Update
gfc_check_vardef_context call.
* check.c (gfc_check_atomic_def, gfc_check_atomic_ref): Ditto.
* intrinsic.c (check_arglist): Ditto.
* io.c (resolve_tag, gfc_resolve_dt, gfc_resolve_inquire):
* Ditto.
* iso-fortran-env.def (ISOFORTRAN_LOCK_TYPE): Add.
* intrinsic.texi (ISO_FORTRAN_ENV): Document LOCK_TYPE.
* module.c (mio_symbol_attribute): Handle lock_comp.
(create_derived_type): New function.
(use_iso_fortran_env_module): Call it to handle LOCK_TYPE.
* parse.c (parse_derived): Add constraint check for LOCK_TYPE.
* resolve.c (resolve_symbol, resolve_lock_unlock): Add
* constraint
checks for LOCK_TYPE.
(gfc_resolve_iterator, resolve_deallocate_expr,
resolve_allocate_expr, resolve_code, resolve_transfer): Update
gfc_check_vardef_context call.
* trans-stmt.h (gfc_trans_lock_unlock): New prototype.
* trans-stmt.c (gfc_trans_lock_unlock): New function.
* trans.c (trans_code): Handle LOCK and UNLOCK.
2011-06-20 Tobias Burnus <burnus@net-b.de>
PR fortran/18918
* gfortran.dg/coarray_lock_1.f90: Update dg-error.
* gfortran.dg/coarray_lock_3.f90: New.
* gfortran.dg/coarray/lock_1.f90: New.
From-SVN: r175228
Diffstat (limited to 'gcc/fortran/expr.c')
| -rw-r--r-- | gcc/fortran/expr.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index f881bb1..4a7a951 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -4373,7 +4373,8 @@ gfc_build_intrinsic_call (const char* name, locus where, unsigned numarg, ...) and just the return status (SUCCESS / FAILURE) be requested. */ gfc_try -gfc_check_vardef_context (gfc_expr* e, bool pointer, const char* context) +gfc_check_vardef_context (gfc_expr* e, bool pointer, bool alloc_obj, + const char* context) { gfc_symbol* sym = NULL; bool is_pointer; @@ -4441,6 +4442,19 @@ gfc_check_vardef_context (gfc_expr* e, bool pointer, const char* context) return FAILURE; } + /* F2008, C1303. */ + if (!alloc_obj + && (attr.lock_comp + || (e->ts.type == BT_DERIVED + && e->ts.u.derived->from_intmod == INTMOD_ISO_FORTRAN_ENV + && e->ts.u.derived->intmod_sym_id == ISOFORTRAN_LOCK_TYPE))) + { + if (context) + gfc_error ("LOCK_TYPE in variable definition context (%s) at %L", + context, &e->where); + return FAILURE; + } + /* INTENT(IN) dummy argument. Check this, unless the object itself is the component of sub-component of a pointer. Obviously, procedure pointers are of no interest here. */ @@ -4555,7 +4569,8 @@ gfc_check_vardef_context (gfc_expr* e, bool pointer, const char* context) } /* Target must be allowed to appear in a variable definition context. */ - if (gfc_check_vardef_context (assoc->target, pointer, NULL) == FAILURE) + if (gfc_check_vardef_context (assoc->target, pointer, false, NULL) + == FAILURE) { if (context) gfc_error ("Associate-name '%s' can not appear in a variable" |